Hello community, here is the log from the commit of package yast2-packager checked in at Thu May 17 14:38:21 CEST 2007. -------- --- yast2-packager/yast2-packager.changes 2007-05-04 08:28:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-05-17 12:34:27.000000000 +0200 @@ -1,0 +2,31 @@ +Thu May 17 12:29:56 CEST 2007 - locilka@suse.cz + +- Sort licenses alphabetically using an lsort instead of common + sort builtin (#274747). +- 2.15.40 + +------------------------------------------------------------------- +Thu May 17 12:20:22 CEST 2007 - lslezak@suse.cz + +- Call Pkg::TargetLoad() when there is a patch provided by + the update source to get applicable patches (#270919) + +------------------------------------------------------------------- +Wed May 16 12:17:03 CEST 2007 - locilka@suse.cz + +- Fixed behavior when Add-On products are automatically added by + list of products defined in add_on_products file. UI layer knowns + about the products and during installation, we can remove them or + add them again. Wizard steps are redrawn immediately after adding + these Add-Ons (#269625). +- Function Packages::Initialize has been split into more smaller + functions for an easier maintenance. +- 2.15.39 + +------------------------------------------------------------------- +Thu May 10 17:40:28 CEST 2007 - lslezak@suse.cz + +- Display "Install more packages?" question also when taboo state + of a package is changed in the package management (#272690) + +------------------------------------------------------------------- Old: ---- yast2-packager-2.15.38.tar.bz2 New: ---- yast2-packager-2.15.40.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.K23398/_old 2007-05-17 14:37:25.000000000 +0200 +++ /var/tmp/diff_new_pack.K23398/_new 2007-05-17 14:37:25.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.15.38) +# spec file for package yast2-packager (Version 2.15.40) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-packager -Version: 2.15.38 +Version: 2.15.40 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.15.38.tar.bz2 +Source0: yast2-packager-2.15.40.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml BuildRequires: yast2 >= 2.15.22 @@ -49,7 +49,7 @@ Arvin Schnell <arvin@suse.de> %prep -%setup -n yast2-packager-2.15.38 +%setup -n yast2-packager-2.15.40 %build %{prefix}/bin/y2tool y2autoconf @@ -88,6 +88,25 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog +* Thu May 17 2007 - locilka@suse.cz +- Sort licenses alphabetically using an lsort instead of common + sort builtin (#274747). +- 2.15.40 +* Thu May 17 2007 - lslezak@suse.cz +- Call Pkg::TargetLoad() when there is a patch provided by + the update source to get applicable patches (#270919) +* Wed May 16 2007 - locilka@suse.cz +- Fixed behavior when Add-On products are automatically added by + list of products defined in add_on_products file. UI layer knowns + about the products and during installation, we can remove them or + add them again. Wizard steps are redrawn immediately after adding + these Add-Ons (#269625). +- Function Packages::Initialize has been split into more smaller + functions for an easier maintenance. +- 2.15.39 +* Thu May 10 2007 - lslezak@suse.cz +- Display "Install more packages?" question also when taboo state + of a package is changed in the package management (#272690) * Fri May 04 2007 - lslezak@suse.cz - close the "Initializing catalogs..." popup before opening another one (#269920) ++++++ yast2-packager-2.15.38.tar.bz2 -> yast2-packager-2.15.40.tar.bz2 ++++++ ++++ 6133 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.38/configure.in new/yast2-packager-2.15.40/configure.in --- old/yast2-packager-2.15.38/configure.in 2007-05-04 08:27:56.000000000 +0200 +++ new/yast2-packager-2.15.40/configure.in 2007-05-17 12:34:49.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-packager dnl -dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.15.38, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.15.39, http://bugs.opensuse.org/, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.38" +VERSION="2.15.39" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.38/src/clients/inst_source.ycp new/yast2-packager-2.15.40/src/clients/inst_source.ycp --- old/yast2-packager-2.15.38/src/clients/inst_source.ycp 2007-05-03 14:46:59.000000000 +0200 +++ new/yast2-packager-2.15.40/src/clients/inst_source.ycp 2007-05-17 12:48:22.000000000 +0200 @@ -6,7 +6,7 @@ * Purpose: * Adding, removing and prioritizing of installation sources for packagemanager. * - * $Id: inst_source.ycp 37804 2007-05-03 12:46:57Z lslezak $ + * $Id: inst_source.ycp 38013 2007-05-17 10:48:21Z locilka $ * */ @@ -411,7 +411,7 @@ <b>Modifying a Catalog</b> To change a catalog media, use <b>Edit</b>. To remove a catalog, use <b>Delete</b>. To enable or disable the catalog, set refreshing on the -initialization time on or off, or refresh it immediatelly, use +initialization time on or off, or refresh it immediately, use <b>Source Settings</b>.</p>"); // help, continued diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.38/src/clients/sw_single.ycp new/yast2-packager-2.15.40/src/clients/sw_single.ycp --- old/yast2-packager-2.15.38/src/clients/sw_single.ycp 2007-05-04 07:57:09.000000000 +0200 +++ new/yast2-packager-2.15.40/src/clients/sw_single.ycp 2007-05-10 17:45:54.000000000 +0200 @@ -7,7 +7,7 @@ * Purpose: contains dialog loop for workflows: * "Install/Remove software" * - * $Id: sw_single.ycp 37818 2007-05-04 05:57:07Z lslezak $ + * $Id: sw_single.ycp 37921 2007-05-10 15:42:30Z lslezak $ */ { @@ -331,13 +331,18 @@ { if (size (packagelist) == 0) // packages given ? { + // names of taboo packages + list<string> taboo_packages = Pkg::GetPackages(`taboo, true); + result = (symbol)WFM::CallFunction( "inst_packages", []); // No: ask user via package selection widget y2milestone ("inst_packages returns %1", result); if (result == `accept) { result = `next; // ask only when there is something to install/remove - ask = Pkg::IsAnyResolvable(`any, `to_install) || Pkg::IsAnyResolvable(`any, `to_remove); + // or when taboo package has been changed + ask = Pkg::IsAnyResolvable(`any, `to_install) || Pkg::IsAnyResolvable(`any, `to_remove) + || Pkg::GetPackages(`taboo, true) != taboo_packages; y2milestone("Ask to restart the package selector: %1", ask); } else diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.38/src/modules/AddOnProduct.ycp new/yast2-packager-2.15.40/src/modules/AddOnProduct.ycp --- old/yast2-packager-2.15.38/src/modules/AddOnProduct.ycp 2007-04-05 11:37:48.000000000 +0200 +++ new/yast2-packager-2.15.40/src/modules/AddOnProduct.ycp 2007-05-16 09:18:47.000000000 +0200 @@ -483,7 +483,7 @@ } /** - * Auto-integrate add-on products in specified file + * Auto-integrate add-on products in specified file (usually add_on_products file) * @param filelist string a file containing a list of add-on products to integrate * @return boolean true on exit */ @@ -512,6 +512,18 @@ return; } Integrate (src); + + // adding the product to the list of products + // bugzilla #269625 + map <string, string> prod = (map <string, string>) Pkg::SourceProductData (src); + + AddOnProduct::add_on_products = add (AddOnProduct::add_on_products, $[ + "media" : src, + "product" : prod["label"]:prod["productname"]:prod["productversion"]:"", + "media_url" : url, + "product_dir" : pth, + ]); + if (size (elements) > 0) { foreach (string e, elements, { @@ -529,6 +541,9 @@ }); } }); + + // reread agents, redraw wizard steps, etc. + ReIntegrateFromScratch(); } /* Export/Import --> */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.38/src/modules/Packages.ycp new/yast2-packager-2.15.40/src/modules/Packages.ycp --- old/yast2-packager-2.15.38/src/modules/Packages.ycp 2007-05-04 08:26:05.000000000 +0200 +++ new/yast2-packager-2.15.40/src/modules/Packages.ycp 2007-05-16 16:04:10.000000000 +0200 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <nashif@suse.de> * - * $Id: Packages.ycp 37819 2007-05-04 06:26:02Z lslezak $ + * $Id: Packages.ycp 38001 2007-05-16 14:04:08Z locilka $ */ { @@ -37,6 +37,7 @@ import "DefaultDesktop"; import "SourceDialogs"; import "FileUtils"; +import "PackageCallbacks"; /** * Force full proposal routine next run @@ -350,7 +351,13 @@ y2milestone ("Found list of add-on products to preselect: %1", Packages::add_on_products_list); Packages::SelectProduct (); PackageCallbacksInit::SetMediaCallbacks(); + + // Set the base workflow before adding more AddOnProducts using the add_on_products file + // Do not force "base workflow" if there is already any base one stored + // bugzilla #269625 + WorkflowManager::SetBaseWorkflow (false); AddOnProduct::AddPreselectedAddOnProducts (Packages::add_on_products_list); + Packages::add_on_products_list = nil; // do not select them any more } } @@ -865,17 +872,7 @@ } } -/** - * Initialize the installation sources - * @param show_popup boolean true to display information about initialization - */ -global void Initialize(boolean show_popup) { - if (init_called || init_in_progress) - { - y2warning ("Packages::Initialize() already called"); - return; - } - init_in_progress = true; +boolean Initialize_BaseInit (boolean show_popup, string & base_url, string & log_url) { boolean popup_open = false; if (show_popup) { @@ -890,8 +887,6 @@ // Initialize package manager init_error = nil; y2milestone ("Packages::Initialize()"); - // usual mountpoint for the source medium - string base_url = ""; if (Mode::test ()) { @@ -904,26 +899,23 @@ } // hide password from URL if present - string log_url = InstURL::HidePassword(base_url); + log_url = InstURL::HidePassword(base_url); y2milestone ("Initialize Package Manager: %1", log_url); // Set languages for packagemanager. Always set the UI language. Set // language for additional packages only in Stage::initial (). Pkg::SetTextLocale (Language::language); - boolean again = true; - if (popup_open) { UI::CloseDialog (); popup_open = false; } - theSources = Pkg::SourceStartCache (true); // dummy in 1st stage - while (again) - { - if (Stage::initial ()) - { + return true; +} + +global void Initialize_StageInitial (boolean show_popup, string base_url, string log_url) { integer initial_source = nil; ImportGPGKeys (); while (initial_source == nil) @@ -989,10 +981,9 @@ { add_on_products_list = nil; } +} - } - else // cont or normal mode - { +global void Initialize_StageNonInitial (boolean show_popup, string base_url, string log_url) { if (theSources == nil || size (theSources) <= 0) { y2error ("Pkg::SourceStartCache failed"); @@ -1014,10 +1005,46 @@ } }); } +} + +/** + * Initialize the installation sources + * @param show_popup boolean true to display information about initialization + */ +global void Initialize(boolean show_popup) { + if (init_called || init_in_progress) + { + y2warning ("Packages::Initialize() already called"); + return; + } + + init_in_progress = true; + + // usual mountpoint for the source medium + string base_url = ""; + // url with hidden password for logging purpose + string log_url = ""; + + Initialize_BaseInit (show_popup, base_url, log_url); + + theSources = Pkg::SourceStartCache (true); // dummy in 1st stage + + boolean again = true; + + while (again) + { + if (Stage::initial ()) + { + Initialize_StageInitial (show_popup, base_url, log_url); + } + else // cont or normal mode + { + Initialize_StageNonInitial (show_popup, base_url, log_url); } y2milestone ("theSources %1", theSources); y2milestone ("theSourceDirectories %1", theSourceDirectories); + if (size (theSources) >= 0) { init_called = true; @@ -1025,8 +1052,6 @@ } else { - import "PackageCallbacks"; - // an error message string errortext = sformat (_("Error while initializing package descriptions. Check the log file %1 for more details."), Directory::logdir + "/y2log") + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.38/src/modules/ProductLicense.ycp new/yast2-packager-2.15.40/src/modules/ProductLicense.ycp --- old/yast2-packager-2.15.38/src/modules/ProductLicense.ycp 2007-03-19 12:55:23.000000000 +0100 +++ new/yast2-packager-2.15.40/src/modules/ProductLicense.ycp 2007-05-17 12:22:27.000000000 +0200 @@ -66,35 +66,44 @@ lang_names_orig = $[]; } - // $[ "en" : "English", "de" : "Deutsch" ] - map<string,string> lang_names = mapmap (string code, list descr, + y2milestone ("L: %1", lang_names_orig); + + map<string,string> lang_names = $[]; + + // $[ "en" : "English (US)", "de" : "Deutsch" ] + lang_names = mapmap (string code, list descr, lang_names_orig, { return $[ code : descr[4]:"" ]; }); /* for the default fallback */ + if (lang_names[""]:nil == nil) { + // language name + lang_names[""] = lang_names_orig["en_US", 4]:""; + } - // language name - lang_names[""] = _("English"); - // language name - lang_names["en"] = _("English"); + if (lang_names["en"]:nil == nil) { + // language name + lang_names["en"] = lang_names_orig["en_US", 4]:""; + } list<list<string> > lang_pairs = maplist (string l, languages, { - string name = lang_names[l]:""; - if (name == "") - { + string name_print = lang_names[l]:""; + + if (name_print == "") { string l_short = substring (l, 0, 2); + foreach (string k, string v, lang_names, { - if (substring (k, 0, 2) == l_short) - { - name = v; + if (substring (k, 0, 2) == l_short) { + name_print = v; return true; } return false; }); } - return [ l, name ]; + + return [ l, name_print ]; }); // filter-out languages that don't have any name @@ -107,8 +116,9 @@ } }); - lang_pairs = sort (list<string> l1, list<string> l2, lang_pairs, { - return l1[1]:"" < l2[1]:""; + lang_pairs = sort (list<string> a, list<string> b, lang_pairs, { + list lsorted = lsort ([a[1]:"", b[1]:""]); + return (lsorted[1]:"" != a[1]:"" || a[1]:"" == b[1]:""); }); list langs = maplist (list<string> descr, lang_pairs, { return `item (`id (descr[0]:""), descr[1]:"", (descr[0]:"" == license_language)); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.38/src/modules/SourceManager.ycp new/yast2-packager-2.15.40/src/modules/SourceManager.ycp --- old/yast2-packager-2.15.38/src/modules/SourceManager.ycp 2007-03-20 15:34:17.000000000 +0100 +++ new/yast2-packager-2.15.40/src/modules/SourceManager.ycp 2007-05-17 12:48:22.000000000 +0200 @@ -7,7 +7,7 @@ * Martin Vidner <mvidner@suse.cz> * Status: Work in Progress * - * $Id: SourceManager.ycp 37044 2007-03-20 14:34:15Z lslezak $ + * $Id: SourceManager.ycp 38013 2007-05-17 10:48:21Z locilka $ * * Representation of the configuration of source-manager. * Input and output routines. @@ -735,7 +735,7 @@ // adding YaST installation source into the ZMD global string SyncLabel () { - // yast is running a zenworks command (rug) to + // yast is running a ZENworks command (rug) to // keep the repository references in sync return _("Synchronizing with ZENworks"); } @@ -1028,8 +1028,8 @@ } else { string message = adding? // rug is a command name - _("Your service was added successfully in YaST, but could not be synchronized with ZenWorks."): - _("Your service was deleted successfully in YaST, but could not be synchronized with ZenWorks."); + _("Your service was added successfully in YaST, but could not be synchronized with ZENworks."): + _("Your service was deleted successfully in YaST, but could not be synchronized with ZENworks."); message = message + ":"; if (ret["stdout"]:[] != []) message = message + "\n" + mergestring (ret["stdout"]:[], "\n"); @@ -1223,7 +1223,7 @@ } /** - * Sync the changed sources to ZenWorks + * Sync the changed sources to ZENworks * @param added_src_ids ids of sources that were added * @param deleted_src_ids ids of sources that were deleted * @return success @@ -1347,7 +1347,7 @@ /** * Used by registration. * This is really hairy because we simultaneously add them to zypp and - * zenworks, but not if they are not signed. (thus being better than + * ZENworks, but not if they are not signed. (thus being better than * inst_source) * @param urls update sources to add * @return a list of added URLs @@ -1367,6 +1367,8 @@ ResetKnownServiceCache (); + boolean target_loaded = false; + // add the sources. // but do not make duplicates (#168740) // we detect them based on alias that suse_register gives us (#158850#c17) @@ -1396,7 +1398,7 @@ // then add the new one y2milestone ("adding source"); integer toadd = Pkg::SourceCreate (url, "/"); - // and add to zenworks too, but only if it succeeded here (#180820) + // and add to ZENworks too, but only if it succeeded here (#180820) if (toadd != -1 && toadd != nil) { ret = add (ret, url); // #180820#c26 @@ -1404,6 +1406,21 @@ { AddOrDeleteZYPPServiceIntoZMD (toadd, true); } + + // call TargetLoad() if there is a patch available + if (!target_loaded) + { + // is there any patch available? + list patches = Pkg::ResolvableProperties("", `patch, ""); + + if (size(patches) > 0) + { + // loaded target is required to get list of applicable patches (#270919) + y2milestone("Source %1 provides %2 patches, loading target...", url, size(patches)); + Pkg::TargetLoad(); + target_loaded = true; + } + } } }); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.15.38/VERSION new/yast2-packager-2.15.40/VERSION --- old/yast2-packager-2.15.38/VERSION 2007-05-04 07:57:33.000000000 +0200 +++ new/yast2-packager-2.15.40/VERSION 2007-05-17 12:48:04.000000000 +0200 @@ -1 +1 @@ -2.15.38 +2.15.40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org