March 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67614 - in /branches/SuSE-SLE-10-SP4-Branch/s390: VERSION package/yast2-s390.changes src/dasd/dialogs.ycp src/modules/DASDController.ycp yast2-s390.spec.in
by aschnell＠svn2.opensuse.org 12 Mar '12

12 Mar '12

Author: aschnell Date: Mon Mar 12 15:50:03 2012 New Revision: 67614 URL: http://svn.opensuse.org/viewcvs/yast?rev=67614&view=rev Log: - fixed DIAG mode setting (bnc#652962) Modified: branches/SuSE-SLE-10-SP4-Branch/s390/VERSION branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes branches/SuSE-SLE-10-SP4-Branch/s390/src/dasd/dialogs.ycp branches/SuSE-SLE-10-SP4-Branch/s390/src/modules/DASDController.ycp branches/SuSE-SLE-10-SP4-Branch/s390/yast2-s390.spec.in Modified: branches/SuSE-SLE-10-SP4-Branch/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/V… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/s390/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/s390/VERSION Mon Mar 12 15:50:03 2012 @@ -1 +1 @@ -2.13.28 +2.13.29 Modified: branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/p… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/s390/package/yast2-s390.changes Mon Mar 12 15:50:03 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Mar 12 15:27:55 CET 2012 - aschnell(a)suse.de + +- fixed DIAG mode setting (bnc#652962) +- 2.13.29 + +------------------------------------------------------------------- Fri Oct 8 14:34:06 CEST 2010 - mzugec(a)suse.de - require s390-tools only on s390 s390x Modified: branches/SuSE-SLE-10-SP4-Branch/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/s… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/s390/src/dasd/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/s390/src/dasd/dialogs.ycp Mon Mar 12 15:50:03 2012 @@ -401,7 +401,10 @@ } foreach (integer id, to_activate, ``{ string channel = DASDController::devices[id,"channel"]:""; + boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; DASDController::diag[channel] = true; + if (active) + DASDController::ActivateDisk(channel, true); }); ReloadDASDDialog (); @@ -421,7 +424,10 @@ } foreach (integer id, to_activate, ``{ string channel = DASDController::devices[id,"channel"]:""; + boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; DASDController::diag[channel] = false; + if (active) + DASDController::ActivateDisk(channel, false); }); ReloadDASDDialog (); Modified: branches/SuSE-SLE-10-SP4-Branch/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/s… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/s390/src/modules/DASDController.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/s390/src/modules/DASDController.ycp Mon Mar 12 15:50:03 2012 @@ -320,12 +320,13 @@ d["formatted"] = formatted; d["partition_info"] = GetPartitionInfo (device); } - string diag_file = sformat("/sys/%1/use_diag", d["sysfs_id"]:""); + + string diag_file = sformat("/sys/%1/device/use_diag", d["sysfs_id"]:""); + y2milestone("diag_file:%1", diag_file); if (FileUtils::Exists(diag_file)){ string use_diag = (string)SCR::Read(.target.string, diag_file); -// y2milestone("use_diag %1", use_diag); - if (substring(use_diag,0,1) == "1") diag[channel]=true; - else diag[channel]=false; + y2milestone("use_diag:%1", use_diag); + diag[channel] = substring(use_diag, 0, 1) == "1"; } return d; }); Modified: branches/SuSE-SLE-10-SP4-Branch/s390/yast2-s390.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/s390/y… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/s390/yast2-s390.spec.in (original) +++ branches/SuSE-SLE-10-SP4-Branch/s390/yast2-s390.spec.in Mon Mar 12 15:50:03 2012 @@ -4,7 +4,7 @@ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite %ifarch s390 s390x -Requires: yast2 s390-tools +Requires: yast2 s390-tools yast2-hardware-detection >= 2.13.8 %endif Summary: Configuration of s390 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67613 - in /branches/SuSE-SLE-10-SP4-Branch/hardware-detection: VERSION package/yast2-hardware-detection.changes src/HwParse.cc
by aschnell＠svn2.opensuse.org 12 Mar '12

12 Mar '12

Author: aschnell Date: Mon Mar 12 15:49:20 2012 New Revision: 67613 URL: http://svn.opensuse.org/viewcvs/yast?rev=67613&view=rev Log: - provide sysfs_id (bnc#652962) Modified: branches/SuSE-SLE-10-SP4-Branch/hardware-detection/VERSION branches/SuSE-SLE-10-SP4-Branch/hardware-detection/package/yast2-hardware-detection.changes branches/SuSE-SLE-10-SP4-Branch/hardware-detection/src/HwParse.cc Modified: branches/SuSE-SLE-10-SP4-Branch/hardware-detection/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/hardwa… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/hardware-detection/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/hardware-detection/VERSION Mon Mar 12 15:49:20 2012 @@ -1 +1 @@ -2.13.7 +2.13.8 Modified: branches/SuSE-SLE-10-SP4-Branch/hardware-detection/package/yast2-hardware-detection.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/hardwa… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/hardware-detection/package/yast2-hardware-detection.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/hardware-detection/package/yast2-hardware-detection.changes Mon Mar 12 15:49:20 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Mar 12 15:27:08 CET 2012 - aschnell(a)suse.de + +- provide sysfs_id (bnc#652962) +- 2.13.8 + +------------------------------------------------------------------- Thu Mar 1 16:57:43 CET 2007 - mvidner(a)suse.cz - Fixed a bug in the last change that converted nearly Modified: branches/SuSE-SLE-10-SP4-Branch/hardware-detection/src/HwParse.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/hardwa… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/hardware-detection/src/HwParse.cc (original) +++ branches/SuSE-SLE-10-SP4-Branch/hardware-detection/src/HwParse.cc Mon Mar 12 15:49:20 2012 @@ -1398,12 +1398,9 @@ add_strlist (hd->unix_dev_names, &out, "dev_names"); add_devnum (&hd->unix_dev_num, &out, "dev_num"); -// the sysfs path could be quite long but noone needs it, see sysfs_bus_id below -#if 0 // sysfs path add_str (hd->sysfs_id, &out, "sysfs_id"); -#endif // sysfs bus id -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67612 - in /trunk/wagon: package/yast2-wagon.changes src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 18:37:50 2012 New Revision: 67612 URL: http://svn.opensuse.org/viewcvs/yast?rev=67612&view=rev Log: - ensure that the migration products are removed (bnc#750746) Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/modules/Wagon.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Thu Mar 8 18:37:50 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Mar 7 08:14:29 UTC 2012 - lslezak(a)suse.cz + +- ensure that the migration products are removed (bnc#750746) + +------------------------------------------------------------------- Wed Feb 15 10:33:50 UTC 2012 - lslezak(a)suse.cz - Automatically save solver test case in the migration proposal Modified: trunk/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/modules/Wagon.ycp (original) +++ trunk/wagon/src/modules/Wagon.ycp Thu Mar 8 18:37:50 2012 @@ -468,6 +468,14 @@ // be compatible with "zypper dup --from" Pkg::SetSolverFlags($["ignoreAlreadyRecommended" : true]); + // ensure the migration products are removed + foreach(string migration_product, migration_products, + { + y2milestone("Removing migration product: %1", migration_product); + Pkg::ResolvableRemove(migration_product, `product); + } + ); + if (MigrationType() == `full) { // run the solver to evaluate applicable patches -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67611 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/PkgFunctions.h src/Resolvable_Install.cc
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 18:32:50 2012 New Revision: 67611 URL: http://svn.opensuse.org/viewcvs/yast?rev=67611&view=rev Log: - added Pkg::ResolvableUpdate() to avoid downgrading resolvables (bnc#751147) Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/PkgFunctions.h trunk/pkg-bindings/src/Resolvable_Install.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Thu Mar 8 18:32:50 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 8 08:16:23 UTC 2012 - lslezak(a)suse.cz + +- added Pkg::ResolvableUpdate() to avoid downgrading resolvables + (bnc#751147) + +------------------------------------------------------------------- Tue Jan 3 16:58:42 UTC 2012 - lslezak(a)suse.cz - check if downloading optional file really succeeded (bnc#736693) Modified: trunk/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgFunctions.h?… ============================================================================== --- trunk/pkg-bindings/src/PkgFunctions.h (original) +++ trunk/pkg-bindings/src/PkgFunctions.h Thu Mar 8 18:32:50 2012 @@ -234,6 +234,17 @@ // a helper function to add or remove an upgrade repository YCPValue AddRemoveUpgradeRepo(const YCPInteger &repo, bool add); + + // action for a resolvable + enum ResolvableAction + { + Install, + Remove, + Update + }; + + // helper for installing/removing/upgrading a resolvable + bool ResolvableUpdateInstallOrDelete(const YCPString& name_r, const YCPSymbol& kind_r, ResolvableAction action); public: // general @@ -694,6 +705,8 @@ /* TYPEINFO: boolean(string,symbol,integer)*/ YCPValue ResolvableInstallRepo( const YCPString& name_r, const YCPSymbol& kind_r, const YCPInteger& repo_r ); /* TYPEINFO: boolean(string,symbol)*/ + YCPValue ResolvableUpdate( const YCPString& name_r, const YCPSymbol& kind_r ); + /* TYPEINFO: boolean(string,symbol)*/ YCPValue ResolvableRemove( const YCPString& name_r, const YCPSymbol& kind_r ); /* TYPEINFO: boolean(string,symbol,boolean)*/ YCPValue ResolvableNeutral( const YCPString& name_r, const YCPSymbol& kind_r, const YCPBoolean& force_r ); Modified: trunk/pkg-bindings/src/Resolvable_Install.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Inst… ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Install.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Install.cc Thu Mar 8 18:32:50 2012 @@ -236,7 +236,7 @@ return YCPBoolean(ret); } -bool ResolvableInstallOrDelete(const YCPString& name_r, const YCPSymbol& kind_r, bool install) +bool PkgFunctions::ResolvableUpdateInstallOrDelete(const YCPString& name_r, const YCPSymbol& kind_r, ResolvableAction action) { zypp::Resolvable::Kind kind; @@ -275,9 +275,68 @@ if (s) { - y2milestone("%s: %s:%s ", install ? "Installing" : "Removing", req_kind.c_str(), name.c_str()); - return install ? s->setToInstall(zypp::ResStatus::APPL_HIGH): - s->setToDelete(zypp::ResStatus::APPL_HIGH); + if (action == Install) + { + y2milestone("Installing %s %s ", req_kind.c_str(), name.c_str()); + return s->setToInstall(zypp::ResStatus::APPL_HIGH); + } + else if (action == Remove) + { + y2milestone("Removing %s %s ", req_kind.c_str(), name.c_str()); + return s->setToDelete(zypp::ResStatus::APPL_HIGH); + } + else if (action == Update) + { + y2milestone("Updating %s %s ", req_kind.c_str(), name.c_str()); + + // update candidate + zypp::PoolItem update = s->updateCandidateObj(); + + // installed version + zypp::PoolItem installed; + if (zypp::traits::isPseudoInstalled(s->kind())) + { + for_(it, s->availableBegin(), s->availableEnd()) + // this is OK also for patches - isSatisfied() excludes !isRelevant() + if (it->status().isSatisfied() + && (!installed || installed->edition() < (*it)->edition())) + installed = *it; + } + else + { + installed = s->installedObj(); + } + + if (!installed) + { + y2milestone("%s is not installed, nothing to update", name.c_str()); + return false; + } + + if (!update) + { + y2milestone("Update for %s is not available, no change", name.c_str()); + return false; + } + + if (update->edition() > installed->edition()) + { + y2milestone("Updating %s from %s.%s to %s.%s", name.c_str(), installed->edition().asString().c_str(), + installed->arch().asString().c_str(), update->edition().asString().c_str(), update->arch().asString().c_str()); + return update.status().setToBeInstalled(whoWantsIt); + } + else + { + y2milestone("%s %s: installed version (%s) is higher than available update (%s), no change", + req_kind.c_str(), name.c_str(), installed->edition().asString().c_str(), update->edition().asString().c_str()); + return false; + } + } + else + { + y2internal("Unknown resolvable action"); + return false; + } } else { @@ -298,12 +357,27 @@ YCPValue PkgFunctions::ResolvableInstall( const YCPString& name_r, const YCPSymbol& kind_r ) { - // true = install - return YCPBoolean(ResolvableInstallOrDelete(name_r, kind_r, true)); + return YCPBoolean(ResolvableUpdateInstallOrDelete(name_r, kind_r, Install)); } // ------------------------ /** + @builtin ResolvableUpgrade + @short Install all resolvables with selected name and kind + @param name_r name of the resolvable + @param kind_r kind of resolvable, can be `product, `patch, `package, `srcpackage or `pattern + @return boolean true if upgrade candidate was selected, false if the highest version is already installed or if there is no upgrade candidate + * +*/ +YCPValue +PkgFunctions::ResolvableUpdate( const YCPString& name_r, const YCPSymbol& kind_r ) +{ + return YCPBoolean(ResolvableUpdateInstallOrDelete(name_r, kind_r, Update)); +} + + +// ------------------------ +/** @builtin ResolvableRemove @short Removes all resolvables with selected name and kind @param name_r name of the resolvable @@ -314,7 +388,7 @@ PkgFunctions::ResolvableRemove ( const YCPString& name_r, const YCPSymbol& kind_r ) { // false = remove - return YCPBoolean(ResolvableInstallOrDelete(name_r, kind_r, false)); + return YCPBoolean(ResolvableUpdateInstallOrDelete(name_r, kind_r, Remove)); } // ------------------------ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67610 - /tags/branch-Code-11-SP2-2_17_32/wagon/
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 17:16:50 2012 New Revision: 67610 URL: http://svn.opensuse.org/viewcvs/yast?rev=67610&view=rev Log: Created tag branch-Code-11-SP2-2_17_32 for wagon Added: tags/branch-Code-11-SP2-2_17_32/wagon/ (props changed) - copied from r67609, branches/SuSE-Code-11-SP2-Branch/wagon/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67609 - in /branches/SuSE-Code-11-SP2-Branch/wagon: VERSION package/yast2-wagon.changes src/clients/wagon_migration_products.ycp src/clients/wagon_selfupdate.ycp yast2-wagon.spec.in
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 17:16:32 2012 New Revision: 67609 URL: http://svn.opensuse.org/viewcvs/yast?rev=67609&view=rev Log: - do not downgrade release packages, avoid migrating again (bnc#751147) - 2.17.32 Modified: branches/SuSE-Code-11-SP2-Branch/wagon/VERSION branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_migration_products.ycp branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_selfupdate.ycp branches/SuSE-Code-11-SP2-Branch/wagon/yast2-wagon.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/VERSION Thu Mar 8 17:16:32 2012 @@ -1 +1 @@ -2.17.31 +2.17.32 Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Thu Mar 8 17:16:32 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 8 12:11:52 UTC 2012 - lslezak(a)suse.cz + +- do not downgrade release packages, avoid migrating again + (bnc#751147) +- 2.17.32 + +------------------------------------------------------------------- Wed Mar 7 08:14:29 UTC 2012 - lslezak(a)suse.cz - ensure that the migration products are removed (bnc#750746) Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_migration_products.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_migration_products.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_migration_products.ycp Thu Mar 8 17:16:32 2012 @@ -57,16 +57,12 @@ return; } - // Product version is the same but release can be different - // product map doesn't contain the release string. To be sure, product will be reinstalled y2milestone ("Upgrading product %1 version %2", product_name, product_version); - // The version is the same, release can be different - if (Pkg::ResolvableInstall (product_name, `product) != true) { - Report::Error (sformat(_("Cannot update installed product %1."), product_name)); - return; - } - affected_products = affected_products + 1; + if (Pkg::ResolvableUpdate(product_name, `product)) + { + affected_products = affected_products + 1; + } }); return affected_products; Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_selfupdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_selfupdate.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_selfupdate.ycp Thu Mar 8 17:16:32 2012 @@ -50,88 +50,19 @@ integer pkgs_affected = 0; - map <string, list <string> > installed_versions = $[]; - - boolean some_packages_selected = false; - foreach (string one_package, packages, { - // All packages of the given name - list <map <string, any> > respros = Pkg::ResolvableProperties (one_package, `package, ""); - - // All installed packages of the given name - list <map <string, any> > installed = filter (map <string, any> one_respro, respros, { - return (one_respro["status"]:`unknown == `installed); - }); - - // All available packages of the given name - list <map <string, any> > available = filter (map <string, any> one_respro, respros, { - return (one_respro["status"]:`unknown == `available); - }); - - // Such package is not installed - if (size (installed) < 1) { - y2milestone ("Package %1 is not installed", one_package); - return; - } - - // Er, installed but not available - if (size (available) < 1) { - y2warning ("Package %1 is installed but not available", one_package); - return; - } - - // Remember the installed version(s) - installed_versions[one_package] = maplist (map <string,any> one_installed, installed, { - return one_installed["version"]:"unknown"; - }); + y2milestone ("Updating package %1", one_package); - // Force upgrade/install - y2milestone ("Selecting package %1 for installation", one_package); - if (Pkg::ResolvableInstall (one_package, `package) == true) { - some_packages_selected = true; - } else { - y2error ("Cannot install package %1", one_package); + if (Pkg::ResolvableUpdate(one_package, `package)) { + pkgs_affected = pkgs_affected + 1; } }); - if (some_packages_selected != true) { - y2milestone ("No packages have been selected for upgrade"); - return pkgs_affected; + if (pkgs_affected > 0) { + // run the solver to check dependencies + SolverRunWithFeedback(); } - // Calling solver to select the best version - SolverRunWithFeedback(); - - y2milestone ("Some packages have been selected, checking..."); - - // Check whether the selected version is different to the already installed one - foreach (string one_package, list <string> previously_installed_versions, installed_versions, { - list <map <string, any> > respros = Pkg::ResolvableProperties (one_package, `package, ""); - - // All selected packages of the given name - list <map <string, any> > selected = filter (map <string, any> one_respro, respros, { - return (one_respro["status"]:`unknown == `selected); - }); - - // The package of a given name is selected - if (size (selected) > 0) { - boolean selection_differs = false; - - foreach (map <string, any> one_selected, selected, { - if (! contains (previously_installed_versions, one_selected["version"]:"some-version")) { - pkgs_affected = pkgs_affected + 1; - selection_differs = true; - break; - } - }); - - if (selection_differs != true) { - y2milestone ("Selection of packages doesn't differ, neutralizing package: %1", one_package); - Pkg::ResolvableNeutral (one_package, `package, false); - } - } - }); - return pkgs_affected; } Modified: branches/SuSE-Code-11-SP2-Branch/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/yast2-wagon.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/yast2-wagon.spec.in Thu Mar 8 17:16:32 2012 @@ -4,10 +4,10 @@ # String::FindMountPoint() Requires: yast2 >= 2.17.110 Requires: yast2-online-update-frontend >= 2.17.9 -# Pkg::AddUpgradeRepo() -Requires: yast2-pkg-bindings >= 2.17.48 -# Pkg::AddUpgradeRepo() -BuildRequires: yast2-pkg-bindings >= 2.17.48 +# Pkg::ResolvableUpdate() +Requires: yast2-pkg-bindings >= 2.17.58 +# Pkg::ResolvableUpdate() +BuildRequires: yast2-pkg-bindings >= 2.17.58 # String::FindMountPoint() BuildRequires: yast2 >= 2.17.110 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67608 - in /branches/SuSE-Code-11-SP2-Branch/wagon: package/yast2-wagon.changes src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 17:09:03 2012 New Revision: 67608 URL: http://svn.opensuse.org/viewcvs/yast?rev=67608&view=rev Log: - ensure that the migration products are removed (bnc#750746) Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Thu Mar 8 17:09:03 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Mar 7 08:14:29 UTC 2012 - lslezak(a)suse.cz + +- ensure that the migration products are removed (bnc#750746) + +------------------------------------------------------------------- Wed Feb 15 10:33:50 UTC 2012 - lslezak(a)suse.cz - Automatically save solver test case in the migration proposal Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Thu Mar 8 17:09:03 2012 @@ -467,6 +467,14 @@ // be compatible with "zypper dup --from" Pkg::SetSolverFlags($["ignoreAlreadyRecommended" : true]); + // ensure the migration products are removed + foreach(string migration_product, migration_products, + { + y2milestone("Removing migration product: %1", migration_product); + Pkg::ResolvableRemove(migration_product, `product); + } + ); + if (MigrationType() == `full) { // run the solver to evaluate applicable patches -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67607 - in /branches/SuSE-Code-11-SP1-Branch/wagon: VERSION package/yast2-wagon.changes src/clients/wagon_migration_products.ycp src/clients/wagon_selfupdate.ycp yast2-wagon.spec.in
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 17:00:29 2012 New Revision: 67607 URL: http://svn.opensuse.org/viewcvs/yast?rev=67607&view=rev Log: - do not downgrade release packages, avoid migrating again (bnc#751147) - 2.17.17.11 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_selfupdate.ycp branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/VERSION Thu Mar 8 17:00:29 2012 @@ -1 +1 @@ -2.17.17.10 +2.17.17.11 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Thu Mar 8 17:00:29 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 8 12:11:52 UTC 2012 - lslezak(a)suse.cz + +- do not downgrade release packages, avoid migrating again + (bnc#751147) +- 2.17.17.11 + +------------------------------------------------------------------- Wed Mar 7 08:14:29 UTC 2012 - lslezak(a)suse.cz - ensure that the migration products are removed (bnc#750746) Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp Thu Mar 8 17:00:29 2012 @@ -57,16 +57,12 @@ return; } - // Product version is the same but release can be different - // product map doesn't contain the release string. To be sure, product will be reinstalled y2milestone ("Upgrading product %1 version %2", product_name, product_version); - // The version is the same, release can be different - if (Pkg::ResolvableInstall (product_name, `product) != true) { - Report::Error (sformat(_("Cannot update installed product %1."), product_name)); - return; - } - affected_products = affected_products + 1; + if (Pkg::ResolvableUpdate(product_name, `product)) + { + affected_products = affected_products + 1; + } }); return affected_products; Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_selfupdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_selfupdate.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_selfupdate.ycp Thu Mar 8 17:00:29 2012 @@ -50,88 +50,19 @@ integer pkgs_affected = 0; - map <string, list <string> > installed_versions = $[]; - - boolean some_packages_selected = false; - foreach (string one_package, packages, { - // All packages of the given name - list <map <string, any> > respros = Pkg::ResolvableProperties (one_package, `package, ""); - - // All installed packages of the given name - list <map <string, any> > installed = filter (map <string, any> one_respro, respros, { - return (one_respro["status"]:`unknown == `installed); - }); - - // All available packages of the given name - list <map <string, any> > available = filter (map <string, any> one_respro, respros, { - return (one_respro["status"]:`unknown == `available); - }); - - // Such package is not installed - if (size (installed) < 1) { - y2milestone ("Package %1 is not installed", one_package); - return; - } - - // Er, installed but not available - if (size (available) < 1) { - y2warning ("Package %1 is installed but not available", one_package); - return; - } - - // Remember the installed version(s) - installed_versions[one_package] = maplist (map <string,any> one_installed, installed, { - return one_installed["version"]:"unknown"; - }); + y2milestone ("Updating package %1", one_package); - // Force upgrade/install - y2milestone ("Selecting package %1 for installation", one_package); - if (Pkg::ResolvableInstall (one_package, `package) == true) { - some_packages_selected = true; - } else { - y2error ("Cannot install package %1", one_package); + if (Pkg::ResolvableUpdate(one_package, `package)) { + pkgs_affected = pkgs_affected + 1; } }); - if (some_packages_selected != true) { - y2milestone ("No packages have been selected for upgrade"); - return pkgs_affected; + if (pkgs_affected > 0) { + // run the solver to check dependencies + SolverRunWithFeedback(); } - // Calling solver to select the best version - SolverRunWithFeedback(); - - y2milestone ("Some packages have been selected, checking..."); - - // Check whether the selected version is different to the already installed one - foreach (string one_package, list <string> previously_installed_versions, installed_versions, { - list <map <string, any> > respros = Pkg::ResolvableProperties (one_package, `package, ""); - - // All selected packages of the given name - list <map <string, any> > selected = filter (map <string, any> one_respro, respros, { - return (one_respro["status"]:`unknown == `selected); - }); - - // The package of a given name is selected - if (size (selected) > 0) { - boolean selection_differs = false; - - foreach (map <string, any> one_selected, selected, { - if (! contains (previously_installed_versions, one_selected["version"]:"some-version")) { - pkgs_affected = pkgs_affected + 1; - selection_differs = true; - break; - } - }); - - if (selection_differs != true) { - y2milestone ("Selection of packages doesn't differ, neutralizing package: %1", one_package); - Pkg::ResolvableNeutral (one_package, `package, false); - } - } - }); - return pkgs_affected; } Modified: branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Thu Mar 8 17:00:29 2012 @@ -4,10 +4,10 @@ # PackagesUI::RunPackageSelector Requires: yast2 >= 2.17.40 Requires: yast2-online-update-frontend >= 2.17.9 -# Pkg::AddUpgradeRepo() -Requires: yast2-pkg-bindings >= 2.17.45.1 -# Pkg::AddUpgradeRepo() -BuildRequires: yast2-pkg-bindings >= 2.17.45.1 +# Pkg::ResolvableUpdate() +Requires: yast2-pkg-bindings >= 2.17.45.6 +# Pkg::ResolvableUpdate() +BuildRequires: yast2-pkg-bindings >= 2.17.45.6 BuildRequires: perl-XML-Simple Requires: perl-XML-Simple -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67606 - /tags/branch-Code-11-SP2-2_17_58/pkg-bindings/
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 16:53:35 2012 New Revision: 67606 URL: http://svn.opensuse.org/viewcvs/yast?rev=67606&view=rev Log: Created tag branch-Code-11-SP2-2_17_58 for pkg-bindings Added: tags/branch-Code-11-SP2-2_17_58/pkg-bindings/ (props changed) - copied from r67605, branches/SuSE-Code-11-SP2-Branch/pkg-bindings/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67605 - /tags/branch-Code-11-SP2-2_17_58/
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 16:53:18 2012 New Revision: 67605 URL: http://svn.opensuse.org/viewcvs/yast?rev=67605&view=rev Log: Created tag branch-Code-11-SP2-2_17_58 Added: tags/branch-Code-11-SP2-2_17_58/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67604 - in /branches/SuSE-Code-11-SP2-Branch/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/PkgFunctions.h src/Resolvable_Install.cc
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 16:53:12 2012 New Revision: 67604 URL: http://svn.opensuse.org/viewcvs/yast?rev=67604&view=rev Log: - added Pkg::ResolvableUpdate() to avoid downgrading resolvables (bnc#751147) - 2.17.58 Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/PkgFunctions.h branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Resolvable_Install.cc Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/VERSION Thu Mar 8 16:53:12 2012 @@ -1 +1 @@ -2.17.57 +2.17.58 Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Thu Mar 8 16:53:12 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 8 08:16:23 UTC 2012 - lslezak(a)suse.cz + +- added Pkg::ResolvableUpdate() to avoid downgrading resolvables + (bnc#751147) +- 2.17.58 + +------------------------------------------------------------------- Thu Jan 26 11:50:25 UTC 2012 - lslezak(a)suse.cz - fixed saving additional repositories added by registration Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/PkgFunctions.h (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/PkgFunctions.h Thu Mar 8 16:53:12 2012 @@ -234,6 +234,17 @@ // a helper function to add or remove an upgrade repository YCPValue AddRemoveUpgradeRepo(const YCPInteger &repo, bool add); + + // action for a resolvable + enum ResolvableAction + { + Install, + Remove, + Update + }; + + // helper for installing/removing/upgrading a resolvable + bool ResolvableUpdateInstallOrDelete(const YCPString& name_r, const YCPSymbol& kind_r, ResolvableAction action); public: // general @@ -790,6 +801,8 @@ /* TYPEINFO: boolean(string,symbol,integer)*/ YCPValue ResolvableInstallRepo( const YCPString& name_r, const YCPSymbol& kind_r, const YCPInteger& repo_r ); /* TYPEINFO: boolean(string,symbol)*/ + YCPValue ResolvableUpdate( const YCPString& name_r, const YCPSymbol& kind_r ); + /* TYPEINFO: boolean(string,symbol)*/ YCPValue ResolvableRemove( const YCPString& name_r, const YCPSymbol& kind_r ); /* TYPEINFO: boolean(string,symbol,boolean)*/ YCPValue ResolvableNeutral( const YCPString& name_r, const YCPSymbol& kind_r, const YCPBoolean& force_r ); Modified: branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Resolvable_Install.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Resolvable_Install.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/pkg-bindings/src/Resolvable_Install.cc Thu Mar 8 16:53:12 2012 @@ -236,7 +236,7 @@ return YCPBoolean(ret); } -bool ResolvableInstallOrDelete(const YCPString& name_r, const YCPSymbol& kind_r, bool install) +bool PkgFunctions::ResolvableUpdateInstallOrDelete(const YCPString& name_r, const YCPSymbol& kind_r, ResolvableAction action) { zypp::Resolvable::Kind kind; @@ -275,9 +275,68 @@ if (s) { - y2milestone("%s: %s:%s ", install ? "Installing" : "Removing", req_kind.c_str(), name.c_str()); - return install ? s->setToInstall(zypp::ResStatus::APPL_HIGH): - s->setToDelete(zypp::ResStatus::APPL_HIGH); + if (action == Install) + { + y2milestone("Installing %s %s ", req_kind.c_str(), name.c_str()); + return s->setToInstall(zypp::ResStatus::APPL_HIGH); + } + else if (action == Remove) + { + y2milestone("Removing %s %s ", req_kind.c_str(), name.c_str()); + return s->setToDelete(zypp::ResStatus::APPL_HIGH); + } + else if (action == Update) + { + y2milestone("Updating %s %s ", req_kind.c_str(), name.c_str()); + + // update candidate + zypp::PoolItem update = s->updateCandidateObj(); + + // installed version + zypp::PoolItem installed; + if (zypp::traits::isPseudoInstalled(s->kind())) + { + for_(it, s->availableBegin(), s->availableEnd()) + // this is OK also for patches - isSatisfied() excludes !isRelevant() + if (it->status().isSatisfied() + && (!installed || installed->edition() < (*it)->edition())) + installed = *it; + } + else + { + installed = s->installedObj(); + } + + if (!installed) + { + y2milestone("%s is not installed, nothing to update", name.c_str()); + return false; + } + + if (!update) + { + y2milestone("Update for %s is not available, no change", name.c_str()); + return false; + } + + if (update->edition() > installed->edition()) + { + y2milestone("Updating %s from %s.%s to %s.%s", name.c_str(), installed->edition().asString().c_str(), + installed->arch().asString().c_str(), update->edition().asString().c_str(), update->arch().asString().c_str()); + return update.status().setToBeInstalled(whoWantsIt); + } + else + { + y2milestone("%s %s: installed version (%s) is higher than available update (%s), no change", + req_kind.c_str(), name.c_str(), installed->edition().asString().c_str(), update->edition().asString().c_str()); + return false; + } + } + else + { + y2internal("Unknown resolvable action"); + return false; + } } else { @@ -298,12 +357,27 @@ YCPValue PkgFunctions::ResolvableInstall( const YCPString& name_r, const YCPSymbol& kind_r ) { - // true = install - return YCPBoolean(ResolvableInstallOrDelete(name_r, kind_r, true)); + return YCPBoolean(ResolvableUpdateInstallOrDelete(name_r, kind_r, Install)); } // ------------------------ /** + @builtin ResolvableUpgrade + @short Install all resolvables with selected name and kind + @param name_r name of the resolvable + @param kind_r kind of resolvable, can be `product, `patch, `package, `srcpackage or `pattern + @return boolean true if upgrade candidate was selected, false if the highest version is already installed or if there is no upgrade candidate + * +*/ +YCPValue +PkgFunctions::ResolvableUpdate( const YCPString& name_r, const YCPSymbol& kind_r ) +{ + return YCPBoolean(ResolvableUpdateInstallOrDelete(name_r, kind_r, Update)); +} + + +// ------------------------ +/** @builtin ResolvableRemove @short Removes all resolvables with selected name and kind @param name_r name of the resolvable @@ -314,7 +388,7 @@ PkgFunctions::ResolvableRemove ( const YCPString& name_r, const YCPSymbol& kind_r ) { // false = remove - return YCPBoolean(ResolvableInstallOrDelete(name_r, kind_r, false)); + return YCPBoolean(ResolvableUpdateInstallOrDelete(name_r, kind_r, Remove)); } // ------------------------ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67603 - in /trunk/s390/src: modules/ZFCPController.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: aschnell Date: Thu Mar 8 16:08:25 2012 New Revision: 67603 URL: http://svn.opensuse.org/viewcvs/yast?rev=67603&view=rev Log: - cleanup Modified: trunk/s390/src/modules/ZFCPController.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Thu Mar 8 16:08:25 2012 @@ -103,27 +103,27 @@ return tohexstring(tointeger(wwpn), 16); } - global boolean IsValidFCPLUN(string fcp_lun) + global boolean IsValidLUN(string lun) { string regexp = "^0x([[:xdigit:]]{1,16})$"; - return regexpmatch(fcp_lun, regexp); + return regexpmatch(lun, regexp); } - global string FormatFCPLUN(string fcp_lun) + global string FormatLUN(string lun) { - if (!IsValidFCPLUN(fcp_lun)) - return fcp_lun; + if (!IsValidLUN(lun)) + return lun; - return tohexstring(tointeger(fcp_lun), 16); + return tohexstring(tointeger(lun), 16); } - global string GetNextLUN(string fcp_lun) + global string GetNextLUN(string lun) { - if (fcp_lun == nil || fcp_lun == "") - fcp_lun = "0"; + if (lun == nil || lun == "") + lun = "0"; - integer old_lun = tointeger(fcp_lun); + integer old_lun = tointeger(lun); integer new_lun = old_lun; foreach (integer k, map<string, any> v, devices, { @@ -206,7 +206,7 @@ "detail" : $[ "controller_id" : FormatChannel(d["controller_id"]:""), "wwpn" : FormatWWPN(d["wwpn"]:""), - "fcp_lun" : FormatFCPLUN(d["fcp_lun"]:""), + "fcp_lun" : FormatLUN(d["fcp_lun"]:""), ], ]; return $[ index : m ]; Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Thu Mar 8 16:08:25 2012 @@ -74,8 +74,8 @@ items = maplist(integer k, map<string, any> d, devices, { string channel = d["detail", "controller_id"]:""; string wwpn = d["detail", "wwpn"]:""; - string fcp_lun = d["detail", "fcp_lun"]:""; - return `item(`id(k), channel, wwpn, fcp_lun); + string lun = d["detail", "fcp_lun"]:""; + return `item(`id(k), channel, wwpn, lun); }); } else @@ -83,9 +83,9 @@ items = maplist(integer k, map<string, any> d, devices, { string channel = d["detail", "controller_id"]:""; string wwpn = d["detail", "wwpn"]:""; - string fcp_lun = d["detail", "fcp_lun"]:""; + string lun = d["detail", "fcp_lun"]:""; string dev_name = d["dev_name"]:""; - return `item(`id(k), channel, wwpn, fcp_lun, dev_name); + return `item(`id(k), channel, wwpn, lun, dev_name); }); } @@ -259,7 +259,7 @@ wwpns = toset(wwpns); luns = maplist(integer index, map<string, any> d, ZFCPController::devices, { - return d["detail", "zfp_lun"]:""; + return d["detail", "fcp_lun"]:""; }); luns = toset(luns); } @@ -271,11 +271,11 @@ wwpns = [ ZFCPController::previous_settings["wwpn"]:"" ]; - string fcp_lun = ZFCPController::previous_settings["fcp_lun"]:""; - if (!isempty(fcp_lun)) - fcp_lun = ZFCPController::GetNextLUN(fcp_lun); + string lun = ZFCPController::previous_settings["fcp_lun"]:""; + if (!isempty(lun)) + lun = ZFCPController::GetNextLUN(lun); - luns = [ fcp_lun ]; + luns = [ lun ]; } term content = `HBox (`HStretch (), `VBox( @@ -292,7 +292,7 @@ `VSpacing (2), `HBox( // combobox - `ComboBox(`id(`fcp_lun), `opt(`hstretch, `editable), _("&LUN"), luns), + `ComboBox(`id(`lun), `opt(`hstretch, `editable), _("&LUN"), luns), // push button Mode::config() ? `Empty() : `PushButton(`id(`get_lun), _("Get LUNs")) ), @@ -306,7 +306,7 @@ UI::ChangeWidget(`id(`channel), `ValidChars, "0123456789abcdefABCDEF."); UI::ChangeWidget(`id(`wwpn), `ValidChars, "0123456789abcdefABCDEFx"); - UI::ChangeWidget(`id(`fcp_lun), `ValidChars, "0123456789abcdefABCDEFx"); + UI::ChangeWidget(`id(`lun), `ValidChars, "0123456789abcdefABCDEFx"); UI::SetFocus(`id(`channel)); @@ -361,7 +361,7 @@ wwpn = ZFCPController::FormatWWPN(wwpn); luns = ZFCPController::GetLUNs(channel, wwpn); - UI::ChangeWidget(`fcp_lun, `Items, luns); + UI::ChangeWidget(`lun, `Items, luns); ret = nil; } else if (ret == `abort || ret == `cancel) @@ -377,7 +377,7 @@ { string channel = (string) UI::QueryWidget(`id(`channel), `Value); string wwpn = (string) UI::QueryWidget(`id(`wwpn), `Value); - string fcp_lun = (string) UI::QueryWidget(`id(`fcp_lun), `Value); + string lun = (string) UI::QueryWidget(`id(`lun), `Value); if (!ZFCPController::IsValidChannel(channel)) { @@ -397,20 +397,20 @@ continue; } - if (!ZFCPController::IsValidFCPLUN(fcp_lun)) + if (!ZFCPController::IsValidLUN(lun)) { // error popup Report::Error(_("The entered LUN is invalid.")); - UI::SetFocus(`fcp_lun); + UI::SetFocus(`lun); ret = nil; continue; } channel = ZFCPController::FormatChannel(channel); wwpn = ZFCPController::FormatWWPN(wwpn); - fcp_lun = ZFCPController::FormatFCPLUN(fcp_lun); + lun = ZFCPController::FormatLUN(lun); - if (ZFCPController::GetDeviceIndex(channel, wwpn, fcp_lun) != nil) + if (ZFCPController::GetDeviceIndex(channel, wwpn, lun) != nil) { // error popup Popup::Error(_("Device already exists.")); @@ -424,11 +424,11 @@ { string channel = (string) UI::QueryWidget(`id(`channel), `Value); string wwpn = (string) UI::QueryWidget(`id(`wwpn), `Value); - string lun = (string) UI::QueryWidget(`id(`fcp_lun), `Value); + string lun = (string) UI::QueryWidget(`id(`lun), `Value); channel = ZFCPController::FormatChannel(channel); wwpn = ZFCPController::FormatWWPN(wwpn); - lun = ZFCPController::FormatFCPLUN(lun); + lun = ZFCPController::FormatLUN(lun); ZFCPController::previous_settings["channel"] = channel; ZFCPController::previous_settings["wwpn"] = wwpn; @@ -482,8 +482,8 @@ map d = ZFCPController::devices[index]:$[]; string channel = d["detail", "controller_id"]:""; string wwpn = d["detail", "wwpn"]:""; - string fcp_lun = d["detail", "fcp_lun"]:""; - ZFCPController::DeactivateDisk(channel, wwpn, fcp_lun); + string lun = d["detail", "fcp_lun"]:""; + ZFCPController::DeactivateDisk(channel, wwpn, lun); }); ZFCPController::ProbeDisks(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67602 - /tags/branch-Code-11-SP1-2_17_45_6/pkg-bindings/
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 13:40:05 2012 New Revision: 67602 URL: http://svn.opensuse.org/viewcvs/yast?rev=67602&view=rev Log: Created tag branch-Code-11-SP1-2_17_45_6 for pkg-bindings Added: tags/branch-Code-11-SP1-2_17_45_6/pkg-bindings/ (props changed) - copied from r67601, branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67601 - /tags/branch-Code-11-SP1-2_17_45_6/
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 13:39:52 2012 New Revision: 67601 URL: http://svn.opensuse.org/viewcvs/yast?rev=67601&view=rev Log: Created tag branch-Code-11-SP1-2_17_45_6 Added: tags/branch-Code-11-SP1-2_17_45_6/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67600 - /tags/branch-Code-11-SP1-2_17_17_11/wagon/
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 13:39:39 2012 New Revision: 67600 URL: http://svn.opensuse.org/viewcvs/yast?rev=67600&view=rev Log: Created tag branch-Code-11-SP1-2_17_17_11 for wagon Added: tags/branch-Code-11-SP1-2_17_17_11/wagon/ (props changed) - copied from r67599, branches/SuSE-Code-11-SP1-Branch/wagon/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67599 - /tags/branch-Code-11-SP1-2_17_17_11/
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 13:39:24 2012 New Revision: 67599 URL: http://svn.opensuse.org/viewcvs/yast?rev=67599&view=rev Log: Created tag branch-Code-11-SP1-2_17_17_11 Added: tags/branch-Code-11-SP1-2_17_17_11/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67598 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/PkgFunctions.h src/Resolvable_Install.cc
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 13:36:38 2012 New Revision: 67598 URL: http://svn.opensuse.org/viewcvs/yast?rev=67598&view=rev Log: - added Pkg::ResolvableUpdate() to avoid downgrading resolvables (bnc#751147) - 2.17.45.6 Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Install.cc Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION Thu Mar 8 13:36:38 2012 @@ -1 +1 @@ -2.17.45.5 +2.17.45.6 Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Thu Mar 8 13:36:38 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 8 08:16:23 UTC 2012 - lslezak(a)suse.cz + +- added Pkg::ResolvableUpdate() to avoid downgrading resolvables + (bnc#751147) +- 2.17.45.6 + +------------------------------------------------------------------- Thu Jan 26 11:50:25 UTC 2012 - lslezak(a)suse.cz - fixed saving additional repositories added by registration Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/PkgFunctions.h Thu Mar 8 13:36:38 2012 @@ -235,6 +235,17 @@ // a helper function to add or remove an upgrade repository YCPValue AddRemoveUpgradeRepo(const YCPInteger &repo, bool add); + + // action for a resolvable + enum ResolvableAction + { + Install, + Remove, + Update + }; + + // helper for installing/removing/upgrading a resolvable + bool ResolvableUpdateInstallOrDelete(const YCPString& name_r, const YCPSymbol& kind_r, ResolvableAction action); public: // general @@ -791,6 +802,8 @@ /* TYPEINFO: boolean(string,symbol,integer)*/ YCPValue ResolvableInstallRepo( const YCPString& name_r, const YCPSymbol& kind_r, const YCPInteger& repo_r ); /* TYPEINFO: boolean(string,symbol)*/ + YCPValue ResolvableUpdate( const YCPString& name_r, const YCPSymbol& kind_r ); + /* TYPEINFO: boolean(string,symbol)*/ YCPValue ResolvableRemove( const YCPString& name_r, const YCPSymbol& kind_r ); /* TYPEINFO: boolean(string,symbol,boolean)*/ YCPValue ResolvableNeutral( const YCPString& name_r, const YCPSymbol& kind_r, const YCPBoolean& force_r ); Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Install.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Install.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Resolvable_Install.cc Thu Mar 8 13:36:38 2012 @@ -236,7 +236,7 @@ return YCPBoolean(ret); } -bool ResolvableInstallOrDelete(const YCPString& name_r, const YCPSymbol& kind_r, bool install) +bool PkgFunctions::ResolvableUpdateInstallOrDelete(const YCPString& name_r, const YCPSymbol& kind_r, ResolvableAction action) { zypp::Resolvable::Kind kind; @@ -275,9 +275,68 @@ if (s) { - y2milestone("%s: %s:%s ", install ? "Installing" : "Removing", req_kind.c_str(), name.c_str()); - return install ? s->setToInstall(zypp::ResStatus::APPL_HIGH): - s->setToDelete(zypp::ResStatus::APPL_HIGH); + if (action == Install) + { + y2milestone("Installing %s %s ", req_kind.c_str(), name.c_str()); + return s->setToInstall(zypp::ResStatus::APPL_HIGH); + } + else if (action == Remove) + { + y2milestone("Removing %s %s ", req_kind.c_str(), name.c_str()); + return s->setToDelete(zypp::ResStatus::APPL_HIGH); + } + else if (action == Update) + { + y2milestone("Updating %s %s ", req_kind.c_str(), name.c_str()); + + // update candidate + zypp::PoolItem update = s->updateCandidateObj(); + + // installed version + zypp::PoolItem installed; + if (zypp::traits::isPseudoInstalled(s->kind())) + { + for_(it, s->availableBegin(), s->availableEnd()) + // this is OK also for patches - isSatisfied() excludes !isRelevant() + if (it->status().isSatisfied() + && (!installed || installed->edition() < (*it)->edition())) + installed = *it; + } + else + { + installed = s->installedObj(); + } + + if (!installed) + { + y2milestone("%s is not installed, nothing to update", name.c_str()); + return false; + } + + if (!update) + { + y2milestone("Update for %s is not available, no change", name.c_str()); + return false; + } + + if (update->edition() > installed->edition()) + { + y2milestone("Updating %s from %s.%s to %s.%s", name.c_str(), installed->edition().asString().c_str(), + installed->arch().asString().c_str(), update->edition().asString().c_str(), update->arch().asString().c_str()); + return update.status().setToBeInstalled(whoWantsIt); + } + else + { + y2milestone("%s %s: installed version (%s) is higher than available update (%s), no change", + req_kind.c_str(), name.c_str(), installed->edition().asString().c_str(), update->edition().asString().c_str()); + return false; + } + } + else + { + y2internal("Unknown resolvable action"); + return false; + } } else { @@ -298,12 +357,27 @@ YCPValue PkgFunctions::ResolvableInstall( const YCPString& name_r, const YCPSymbol& kind_r ) { - // true = install - return YCPBoolean(ResolvableInstallOrDelete(name_r, kind_r, true)); + return YCPBoolean(ResolvableUpdateInstallOrDelete(name_r, kind_r, Install)); } // ------------------------ /** + @builtin ResolvableUpgrade + @short Install all resolvables with selected name and kind + @param name_r name of the resolvable + @param kind_r kind of resolvable, can be `product, `patch, `package, `srcpackage or `pattern + @return boolean true if upgrade candidate was selected, false if the highest version is already installed or if there is no upgrade candidate + * +*/ +YCPValue +PkgFunctions::ResolvableUpdate( const YCPString& name_r, const YCPSymbol& kind_r ) +{ + return YCPBoolean(ResolvableUpdateInstallOrDelete(name_r, kind_r, Update)); +} + + +// ------------------------ +/** @builtin ResolvableRemove @short Removes all resolvables with selected name and kind @param name_r name of the resolvable @@ -314,7 +388,7 @@ PkgFunctions::ResolvableRemove ( const YCPString& name_r, const YCPSymbol& kind_r ) { // false = remove - return YCPBoolean(ResolvableInstallOrDelete(name_r, kind_r, false)); + return YCPBoolean(ResolvableUpdateInstallOrDelete(name_r, kind_r, Remove)); } // ------------------------ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67597 - in /branches/SuSE-Code-11-SP1-Branch/wagon: VERSION package/yast2-wagon.changes src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: lslezak Date: Thu Mar 8 13:13:37 2012 New Revision: 67597 URL: http://svn.opensuse.org/viewcvs/yast?rev=67597&view=rev Log: - ensure that the migration products are removed (bnc#750746) - 2.17.17.10 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/VERSION Thu Mar 8 13:13:37 2012 @@ -1 +1 @@ -2.17.17.9 +2.17.17.10 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Thu Mar 8 13:13:37 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Mar 7 08:14:29 UTC 2012 - lslezak(a)suse.cz + +- ensure that the migration products are removed (bnc#750746) +- 2.17.17.10 + +------------------------------------------------------------------- Wed Feb 15 10:33:50 UTC 2012 - lslezak(a)suse.cz - Automatically save solver test case in the migration proposal Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Thu Mar 8 13:13:37 2012 @@ -467,6 +467,14 @@ // be compatible with "zypper dup --from" Pkg::SetSolverFlags($["ignoreAlreadyRecommended" : true]); + // ensure the migration products are removed + foreach(string migration_product, migration_products, + { + y2milestone("Removing migration product: %1", migration_product); + Pkg::ResolvableRemove(migration_product, `product); + } + ); + if (MigrationType() == `full) { // run the solver to evaluate applicable patches -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67596 - in /trunk/s390/src: dasd/dialogs.ycp dasd/helps.ycp modules/DASDController.ycp modules/ZFCPController.ycp zfcp/dialogs.ycp zfcp/helps.ycp
by aschnell＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: aschnell Date: Thu Mar 8 11:56:12 2012 New Revision: 67596 URL: http://svn.opensuse.org/viewcvs/yast?rev=67596&view=rev Log: - consistent use of "Channel ID", "WWPN" and "LUN" (discussed with Ihno) - hide get buttons in zfcp add dialog in config mode Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/dasd/helps.ycp trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp trunk/s390/src/zfcp/dialogs.ycp trunk/s390/src/zfcp/helps.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Thu Mar 8 11:56:12 2012 @@ -136,7 +136,7 @@ { header = `header( // table header - `Right(_("Channel")), + `Right(_("Channel ID")), // table header _("Format"), // table header @@ -147,7 +147,7 @@ { header = `header( // table header - `Right(_("Channel")), + `Right(_("Channel ID")), // table header _("Device"), // table header @@ -180,9 +180,9 @@ term content = `VBox( `HBox( // text entry - `InputField(`id(`min_chan), `opt(`hstretch), _("Mi&nimum Channel"), DASDController::filter_min), + `InputField(`id(`min_chan), `opt(`hstretch), _("Mi&nimum Channel ID"), DASDController::filter_min), // text entry - `InputField(`id(`max_chan), `opt(`hstretch), _("Ma&ximum Channel"), DASDController::filter_max), + `InputField(`id(`max_chan), `opt(`hstretch), _("Ma&ximum Channel ID"), DASDController::filter_max), `VBox ( `Label (""), // push button @@ -249,7 +249,7 @@ if (!DASDController::IsValidChannel(filter_min) || !DASDController::IsValidChannel(filter_max)) { // error popup - Popup::Error(_("Invalid filter channels.")); + Popup::Error(_("Invalid filter channel IDs.")); ret = nil; continue; } @@ -477,7 +477,7 @@ `VStretch (), `TextEntry (`id(`channel), `opt (`hstretch), // text entry - _("&Channel Number") + _("&Channel ID") ), `VSpacing (2), // check box @@ -518,7 +518,7 @@ if (!DASDController::IsValidChannel(channel)) { // error popup - Popup::Error(_("Not a valid channel.")); + Popup::Error(_("Not a valid channel ID.")); UI::SetFocus(`channel); ret = nil; continue; Modified: trunk/s390/src/dasd/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/helps.ycp?rev=6759… ============================================================================== --- trunk/s390/src/dasd/helps.ycp (original) +++ trunk/s390/src/dasd/helps.ycp Thu Mar 8 11:56:12 2012 @@ -39,8 +39,8 @@ In this dialog, manage DASD disks on your system.") + /* Disk selection dialog help 2/4 */ -_("To filter the displayed disks, set the Minimum Channel and -the Maximum Channel and click Filter. +_("To filter the displayed disks, set the Minimum Channel ID and +the Maximum Channel ID and click Filter. ") + /* Disk selection dialog help 4/4 */ @@ -55,8 +55,8 @@ In this dialog, manage DASD disks on your system.") + /* Disk selection dialog help 2/4 */ -_("To filter the displayed disks, set the Minimum Channel and -the Maximum Channel and click Filter. +_("To filter the displayed disks, set the Minimum Channel ID and +the Maximum Channel ID and click Filter. ") + /* Disk selection dialog help 3/4 */ @@ -70,7 +70,7 @@ /* Disk add help 1/3 */ "disk_add_config" : _("<big>Add New DASD Disk</big> -To add a disk, enter the Channel Number of the DASD disk as +To add a disk, enter the Channel ID of the DASD disk as identifier.") + /* Disk add help 1/3 */ Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Thu Mar 8 11:56:12 2012 @@ -301,7 +301,7 @@ { ret = maplist (integer index, map<string, any> d, devices, { // summary text, %1 is channel, %2 and %3 are Yes or No - return sformat(_("Channel: %1, Format: %2, DIAG: %3"), d["channel"]:"", + return sformat(_("Channel ID: %1, Format: %2, DIAG: %3"), d["channel"]:"", String::YesNo(d["format"]:false), String::YesNo(d["diag"]:false)); }); } @@ -314,7 +314,7 @@ ret = maplist (integer index, map<string, any> d, active_devices, { // summary text, %1 is channel, %2 is device name, %3 is Yes or No - return sformat(_("Channel: %1, Device: %2, DIAG: %3"), d["channel"]:"", + return sformat(_("Channel ID: %1, Device: %2, DIAG: %3"), d["channel"]:"", d["dev_name"]:"", String::YesNo(d["diag"]:false)); }); } Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Thu Mar 8 11:56:12 2012 @@ -313,7 +313,7 @@ { ret = maplist (integer index, map<string,any> d, devices, { // summary text, %1 is channel, %2 is WWPN, %3 is LUN - return sformat(_("Channel: %1, WWPN: %2, ZFCP LUN: %3"), + return sformat(_("Channel ID: %1, WWPN: %2, LUN: %3"), d["detail", "controller_id"]:"", d["detail", "wwpn"]:"", d["detail", "fcp_lun"]:""); }); @@ -322,7 +322,7 @@ { ret = maplist (integer index, map<string,any> d, devices, { // summary text, %1 is channel, %2 is WWPN, %3 is LUN, %4 is device name - return sformat(_("Channel: %1, WWPN: %2, ZFCP LUN: %3, Device: %4"), + return sformat(_("Channel ID: %1, WWPN: %2, LUN: %3, Device: %4"), d["detail", "controller_id"]:"", d["detail", "wwpn"]:"", d["detail", "fcp_lun"]:"", d["dev_name"]:""); }); @@ -468,13 +468,13 @@ case 8: Report::Error (sformat ( // error report, %1 is device identification - _("%1: ZFCP LUN could not be unregistered."), channel)); + _("%1: LUN could not be unregistered."), channel)); break; case 9: Report::Error (sformat ( // error report, %1 is device identification - _("%1: ZFCP WWPN could not be unregistered."), channel)); + _("%1: WWPN could not be unregistered."), channel)); break; default: Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Thu Mar 8 11:56:12 2012 @@ -110,22 +110,22 @@ { header = `header( // table header - `Right(_("Channel Number")), + `Right(_("Channel ID")), // table header `Right(_("WWPN")), // table header - `Right(_("ZFCP-LUN")) + `Right(_("LUN")) ); } else { header = `header( // table header - `Right(_("Channel Number")), + `Right(_("Channel ID")), // table header `Right(_("WWPN")), // table header - `Right(_("ZFCP-LUN")), + `Right(_("LUN")), // table header _("Device") ); @@ -135,9 +135,9 @@ term content = `VBox( `HBox( // text entry - `InputField(`id(`min_chan), `opt(`hstretch), _("Mi&nimum Channel"), ZFCPController::filter_min), + `InputField(`id(`min_chan), `opt(`hstretch), _("Mi&nimum Channel ID"), ZFCPController::filter_min), // text entry - `InputField(`id(`max_chan), `opt(`hstretch), _("Ma&ximum Channel"), ZFCPController::filter_max), + `InputField(`id(`max_chan), `opt(`hstretch), _("Ma&ximum Channel ID"), ZFCPController::filter_max), `VBox ( `Label (""), // push button @@ -197,7 +197,7 @@ if (!ZFCPController::IsValidChannel(filter_min) || !ZFCPController::IsValidChannel(filter_max)) { // error popup - Popup::Error(_("Invalid filter channels.")); + Popup::Error(_("Invalid filter channel IDs.")); ret = nil; continue; } @@ -239,47 +239,62 @@ /* Minimal text for the help */ string help = ZFCP_HELPS["disk_add"]:""; - /* Dialog caption */ + // dialog caption string caption = _("Add New ZFCP Device"); - string fcp_lun = ZFCPController::previous_settings["fcp_lun"]:""; - if (!isempty(fcp_lun)) - fcp_lun = ZFCPController::GetNextLUN(fcp_lun); + list<string> channels = []; + list<string> wwpns = []; + list<string> luns = []; - list<string> items = []; if (Mode::config ()) { - items = maplist (integer index, map<string, any> d, ZFCPController::devices, { + channels = maplist(integer index, map<string, any> d, ZFCPController::devices, { return d["detail", "controller_id"]:""; }); - items = toset (items); + channels = toset(channels); + + wwpns = maplist(integer index, map<string, any> d, ZFCPController::devices, { + return d["detail", "wwpn"]:""; + }); + wwpns = toset(wwpns); + + luns = maplist(integer index, map<string, any> d, ZFCPController::devices, { + return d["detail", "zfp_lun"]:""; + }); + luns = toset(luns); } else { - items = maplist (map<string, any> c, ZFCPController::GetControllers(), { + channels = maplist (map<string, any> c, ZFCPController::GetControllers(), { return c["sysfs_bus_id"]:""; }); + + wwpns = [ ZFCPController::previous_settings["wwpn"]:"" ]; + + string fcp_lun = ZFCPController::previous_settings["fcp_lun"]:""; + if (!isempty(fcp_lun)) + fcp_lun = ZFCPController::GetNextLUN(fcp_lun); + + luns = [ fcp_lun ]; } - /* Dialog content */ term content = `HBox (`HStretch (), `VBox( `VStretch (), - `ComboBox (`id(`channel), `opt (`editable, `hstretch), - // combo box - _("&Channel Number"), - items), + // combo box + `ComboBox(`id(`channel), `opt (`editable, `hstretch), _("&Channel ID"), channels), `VSpacing (2), - `HBox( - // text entry - `ComboBox(`id(`wwpn), `opt(`hstretch, `editable), _("&WWPN"), - [ ZFCPController::previous_settings["wwpn"]:"" ]), - `PushButton(`id(`get_wwpn), _("Get WWPNs")) + `HBox( + // combo box + `ComboBox(`id(`wwpn), `opt(`hstretch, `editable), _("&WWPN"), wwpns), + // push button + Mode::config() ? `Empty() : `PushButton(`id(`get_wwpn), _("Get WWPNs")) ), `VSpacing (2), - `HBox( - // text entry - `ComboBox(`id(`fcp_lun), `opt(`hstretch, `editable), _("&FCP-LUN"), [ fcp_lun ]), - `PushButton(`id(`get_lun), _("Get LUNs")) + `HBox( + // combobox + `ComboBox(`id(`fcp_lun), `opt(`hstretch, `editable), _("&LUN"), luns), + // push button + Mode::config() ? `Empty() : `PushButton(`id(`get_lun), _("Get LUNs")) ), `VStretch () ), `HStretch ()); @@ -307,7 +322,7 @@ if (!ZFCPController::IsValidChannel(channel)) { // error popup - Popup::Error(_("Not a valid channel.")); + Popup::Error(_("Not a valid channel ID.")); UI::SetFocus(`channel); ret = nil; continue; @@ -315,8 +330,8 @@ channel = ZFCPController::FormatChannel(channel); - list<string> items = ZFCPController::GetWWPNs(channel); - UI::ChangeWidget(`wwpn, `Items, items); + wwpns = ZFCPController::GetWWPNs(channel); + UI::ChangeWidget(`wwpn, `Items, wwpns); ret = nil; } else if (ret == `get_lun) @@ -327,7 +342,7 @@ if (!ZFCPController::IsValidChannel(channel)) { // error popup - Popup::Error(_("Not a valid channel.")); + Popup::Error(_("Not a valid channel ID.")); UI::SetFocus(`channel); ret = nil; continue; @@ -345,8 +360,8 @@ channel = ZFCPController::FormatChannel(channel); wwpn = ZFCPController::FormatWWPN(wwpn); - list<string> items = ZFCPController::GetLUNs(channel, wwpn); - UI::ChangeWidget(`fcp_lun, `Items, items); + luns = ZFCPController::GetLUNs(channel, wwpn); + UI::ChangeWidget(`fcp_lun, `Items, luns); ret = nil; } else if (ret == `abort || ret == `cancel) @@ -367,7 +382,7 @@ if (!ZFCPController::IsValidChannel(channel)) { // error popup - Popup::Error(_("Not a valid channel.")); + Popup::Error(_("Not a valid channel ID.")); UI::SetFocus(`channel); ret = nil; continue; @@ -385,7 +400,7 @@ if (!ZFCPController::IsValidFCPLUN(fcp_lun)) { // error popup - Report::Error(_("The entered FCP-LUN is invalid.")); + Report::Error(_("The entered LUN is invalid.")); UI::SetFocus(`fcp_lun); ret = nil; continue; Modified: trunk/s390/src/zfcp/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/helps.ycp?rev=6759… ============================================================================== --- trunk/s390/src/zfcp/helps.ycp (original) +++ trunk/s390/src/zfcp/helps.ycp Thu Mar 8 11:56:12 2012 @@ -54,11 +54,11 @@ /* Disk add help 1/2 */ "disk_add" : _("<big>Add New ZFCP Device</big> Enter the identifier of the device to add, the -Channel Number of the ZFCP controller, the worldwide port number -(WWPN) and the FCP-LUN number. +Channel ID of the ZFCP controller, the worldwide port number +(WWPN) and the LUN number. ") + /* Disk add help 2/2, This is HTML, so finally "<devno>" is displayed as "<devno>" */ -_("The Channel Number must be entered with lowercase letters in a sysfs conforming +_("The Channel ID must be entered with lowercase letters in a sysfs conforming format 0.0.<devno>, such as <tt>0.0.5c51</tt>. The WWPN must be entered with lowercase letters as a 16-digit hex value, such as <tt>0x5005076300c40e5a</tt>. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67595 - /branches/SuSE-Code-11-SP2-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes
by gs＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: gs Date: Thu Mar 8 11:46:46 2012 New Revision: 67595 URL: http://svn.opensuse.org/viewcvs/yast?rev=67595&view=rev Log: improve license popup Modified: branches/SuSE-Code-11-SP2-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes Modified: branches/SuSE-Code-11-SP2-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes Thu Mar 8 11:46:46 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 8 11:44:37 CET 2012 - gs(a)suse.de + +- Better apperance of license popup + +------------------------------------------------------------------- Mon Sep 5 15:56:49 CEST 2011 - gs(a)suse.de - Require latest yast2-ncurses version to prevent update/upgrade -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67594 - /branches/SuSE-Code-11-SP2-Branch/ncurses-pkg/src/NCPkgTable.cc
by gs＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: gs Date: Thu Mar 8 11:44:16 2012 New Revision: 67594 URL: http://svn.opensuse.org/viewcvs/yast?rev=67594&view=rev Log: improve license popup Modified: branches/SuSE-Code-11-SP2-Branch/ncurses-pkg/src/NCPkgTable.cc Modified: branches/SuSE-Code-11-SP2-Branch/ncurses-pkg/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ncurses-pkg/src/NCPkgTable.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/ncurses-pkg/src/NCPkgTable.cc Thu Mar 8 11:44:16 2012 @@ -244,9 +244,8 @@ if (!license_confirmed) { NCPopupInfo * info = new NCPopupInfo( wpos( (lines * 10)/100, (cols * 10) /100), - NCPkgStrings::NotifyLabel(), - string( _("End User License Agreement") + - "" + pkgName + " " + packager->createDescrText( license ) ), + _("End User License Agreement"), + "" + pkgName + " " + packager->createDescrText( license ), NCPkgStrings::AcceptLabel(), NCPkgStrings::CancelLabel() ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67593 - /branches/SuSE-Code-11-SP1-Branch/rdp/yast2-rdp.spec.in
by locilka＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: locilka Date: Thu Mar 8 11:35:40 2012 New Revision: 67593 URL: http://svn.opensuse.org/viewcvs/yast?rev=67593&view=rev Log: Another spec file fix Modified: branches/SuSE-Code-11-SP1-Branch/rdp/yast2-rdp.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/rdp/yast2-rdp.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/rdp/y… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/rdp/yast2-rdp.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/rdp/yast2-rdp.spec.in Thu Mar 8 11:35:40 2012 @@ -25,7 +25,6 @@ @yncludedir@/rdp/* @clientdir@/rdp.ycp @clientdir@/rdp_*.ycp -@moduledir@/Rdp.* -@moduledir@/Rdp2.* +@moduledir@/RDP.* @desktopdir@/rdp.desktop %doc @docdir@ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67592 - /branches/SuSE-Code-11-SP1-Branch/rdp/yast2-rdp.spec.in
by locilka＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: locilka Date: Thu Mar 8 11:32:42 2012 New Revision: 67592 URL: http://svn.opensuse.org/viewcvs/yast?rev=67592&view=rev Log: Fixed spec file Modified: branches/SuSE-Code-11-SP1-Branch/rdp/yast2-rdp.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/rdp/yast2-rdp.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/rdp/y… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/rdp/yast2-rdp.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/rdp/yast2-rdp.spec.in Thu Mar 8 11:32:42 2012 @@ -2,7 +2,7 @@ @HEADER@ Requires: yast2 -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-network BuildArchitectures: noarch -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67591 - /branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes
by gs＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: gs Date: Thu Mar 8 11:27:06 2012 New Revision: 67591 URL: http://svn.opensuse.org/viewcvs/yast?rev=67591&view=rev Log: bnc #724119, bnc #737752 Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes Thu Mar 8 11:27:06 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 8 11:18:13 CET 2012 - gs(a)suse.de + +- NCRichText: interpret html tags inside <pre> (bnc #724119), + show license text correctly (bnc #737752) + +------------------------------------------------------------------- Thu Jun 16 12:34:46 CEST 2011 - gs(a)suse.de - Fixed segfault in event handling (bnc #696595) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67590 - in /branches/SuSE-Code-11-SP2-Branch/ncurses/src: NCRichText.cc NCRichText.h
by gs＠svn2.opensuse.org 08 Mar '12

08 Mar '12

Author: gs Date: Thu Mar 8 11:26:16 2012 New Revision: 67590 URL: http://svn.opensuse.org/viewcvs/yast?rev=67590&view=rev Log: interpret html tags inside <pre> (bnc #724119), also solves problem with license text (bnc #737752) Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCRichText.cc branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCRichText.h Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCRichText.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCRichText.cc Thu Mar 8 11:26:16 2012 @@ -160,7 +160,7 @@ , NCPadWidget( parent ) , text( ntext ) , plainText( plainTextMode ) - , textwidth( 0 ) + , textwidth( 0 ) , cl( 0 ) , cc( 0 ) , cindent( 0 ) @@ -322,36 +322,23 @@ } } - -void NCRichText::PadPlainTXT( const wchar_t * osch, const unsigned olen ) +void NCRichText::PadPreTXT( const wchar_t * osch, const unsigned olen ) { wstring wtxt( osch, olen ); + // resolve the entities even in PRE (#71718) wtxt = filterEntities( wtxt ); - + NCstring nctxt( wtxt ); NCtext ftext( nctxt ); - if ( ftext.Columns() > textwidth ) - textwidth = ftext.Columns(); - - AdjustPad( wsze( cl + ftext.Lines(), textwidth ) ); - // insert the text const wchar_t * sch = wtxt.data(); while ( *sch ) { - if ( *sch != L'\r' ) // skip carriage return - { - myPad()->addwstr( sch, 1 ); // add one wide chararacter - cc += wcwidth( *sch ); + myPad()->addwstr( sch, 1 ); // add one wide chararacter - if ( *sch == L'\n' ) - { - PadNL(); // add a new line - } - } ++sch; } } @@ -398,21 +385,92 @@ while ( *wch && WDtoken.find( *wch ) == wstring::npos ); } +static wstring PREtoken( L"<\n\v\r\f" ); // line manipulations + TokenStart '<' + inline void SkipPreTXT( const wchar_t *& wch ) { + do + { + ++wch; + } + while ( *wch && PREtoken.find( *wch ) == wstring::npos ); +} + + +void NCRichText::AdjustPrePad( const wchar_t *osch ) +{ + const wchar_t * wch = osch; wstring wstr( wch, 6 ); + size_t llen = 0; // longest line + size_t tmp_len = 0; // width of current line + + list<NCstring>::const_iterator line; // iterator for list <NCstring> mtext + std::wstring::const_iterator wstr_it; // iterator for wstring + do { - ++wch; + ++wch; wstr.assign( wch, 6 ); } while ( *wch && wstr != L"</pre>" ); -} + wstring wtxt( osch, wch - osch ); + + // resolve the entities to get correct length for calculation of longest line + wtxt = filterEntities( wtxt ); + wstring to_repl = L" "; + size_t pos; + // replace by \n to get appropriate lines in NCtext + for ( ; (pos = wtxt.find( to_repl )) != wstring::npos ; ) + wtxt.replace( pos, to_repl.length(), L"\n" ); + // handle DOS text + for ( ; (pos = wtxt.find( L"\r" )) != wstring::npos ; ) + wtxt.replace( pos, 1, L"" ); + for ( ; (pos = wtxt.find( L"\f" )) != wstring::npos ; ) + wtxt.replace( pos, 1, L"\n" ); + + yuiDebug() << "Input: " << wtxt << " olen: " << wch - osch << endl; + + NCstring nctxt( wtxt ); + NCtext ftext( nctxt ); + + // iterate through NCtext + for ( line = ftext.Text().begin(); line != ftext.Text().end(); ++line ) + { + tmp_len = 0; + + for ( wstr_it = ( *line ).str().begin(); wstr_it != ( *line ).str().end() ; ++wstr_it ) + { + // skip html tags + if ( *wstr_it == '<' ) + { + wstr_it = find(wstr_it, (*line).str().end(), L'>'); + } + else if ( *wstr_it == '\t' ) + { + tmp_len += myPad()->tabsize(); + } + else + { + tmp_len += wcwidth( *wstr_it ); + } + } + + if ( tmp_len > llen ) + llen = tmp_len; + } + + if ( llen > textwidth ) + { + textwidth = llen; + AdjustPad( wsze( cl + ftext.Lines(), llen ) ); // adjust pad to longest line + } + +} void NCRichText::DrawHTMLPad() { @@ -441,6 +499,7 @@ case L'\n': case L'\v': case L'\r': + case L'\f': if ( ! preTag ) { SkipWS( wch ); @@ -448,12 +507,20 @@ } else { - if ( *wch != L'\r' ) // skip carriage return + switch ( *wch ) { - myPad()->addwstr( wch, 1 ); // add the wide chararacter - cc += wcwidth( *wch ); - if ( *wch == '\n' ) - PadNL(); + case L' ': // add white space + case L'\t': + myPad()->addwstr( wch, 1 ); + break; + + case L'\n': + case L'\f': + PadNL(); // add new line + break; + + default: + yuiDebug() << "Ignoring " << *wch << endl; } ++wch; } @@ -461,16 +528,14 @@ break; case L'<': - if ( !preTag ) - { - swch = wch; - SkipToken( wch ); + swch = wch; + SkipToken( wch ); + + if ( PadTOKEN( swch, wch ) ) + break; // strip token + else + wch = swch; // reset and fall through - if ( PadTOKEN( swch, wch ) ) - break; // strip token - else - wch = swch; // reset and fall through - } default: swch = wch; @@ -482,9 +547,7 @@ else { SkipPreTXT( wch ); - PadPlainTXT( swch, wch - swch ); - preTag = false; - PadNL(); // add new line after pre is closed + PadPreTXT( swch, wch - swch ); } break; @@ -493,6 +556,7 @@ PadBOL(); AdjustPad( wsze( cl, textwidth ) ); + yuiDebug() << "Anchors: " << anchors.size() << endl; for ( unsigned i = 0; i < anchors.size(); ++i ) @@ -575,7 +639,8 @@ /** * Get the number of columns needed to print a 'wstring'. Only printable characters - * are taken into account because others would return -1 (e.g. '\n'). + * are taken into account because otherwise 'wcwidth' would return -1 (e.g. for '\n'). + * Tabs are calculated with tabsize(). * Attention: only use textWidth() to calculate space, not for iterating through a text * or to get the length of a text (real text length includes new lines). */ @@ -588,7 +653,13 @@ { // check whether char is printable if ( iswprint( *wstr_it ) ) + { len += wcwidth( *wstr_it ); + } + else if ( *wstr_it == '\t' ) + { + len += myPad()->tabsize(); + } } return len; @@ -819,7 +890,7 @@ else if ( value == L"li" ) token = T_LI; else if ( value == L"ol" ) { token = T_LEVEL; leveltag = 1; } else if ( value == L"qt" ) token = T_IGNORE; - else if ( value == L"tt" ) token = T_TT; + else if ( value == L"tt" ) token = T_IGNORE; else if ( value == L"ul" ) { token = T_LEVEL; leveltag = 0; } break; @@ -959,11 +1030,13 @@ if ( !endtag ) { - preTag = true; // display plain text + preTag = true; // display text preserving newlines and spaces + AdjustPrePad( ech ); } else { preTag = false; + PadNL(); // add new line (text may continue after </pre>) } break; Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCRichText.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCRichText.h (original) +++ branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCRichText.h Thu Mar 8 11:26:16 2012 @@ -1,4 +1,3 @@ - /*---------------------------------------------------------------------\ | | | __ __ ____ _____ ____ | @@ -69,8 +68,7 @@ unsigned cindent; bool atbol; - bool preTag; // default is false; set true - // if <pre> tag is found + bool preTag; // <pre> tag unsigned Tattr; @@ -190,7 +188,8 @@ void PadBOL(); void PadWS( const bool tab = false ); void PadTXT( const wchar_t * sch, const unsigned len ); - void PadPlainTXT( const wchar_t * sch, const unsigned len ); + void PadPreTXT( const wchar_t * sch, const unsigned len ); + void AdjustPrePad( const wchar_t * sch ); bool PadTOKEN( const wchar_t * sch, const wchar_t *& ech ); protected: -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0