Hello community, here is the log from the commit of package yast2-installation checked in at Wed May 7 21:51:48 CEST 2008. -------- --- yast2-installation/yast2-installation.changes 2008-04-30 12:10:07.000000000 +0200 +++ yast2-installation/yast2-installation.changes 2008-05-07 21:50:42.734456000 +0200 @@ -1,0 +2,20 @@ +Tue May 6 17:37:22 CEST 2008 - locilka@suse.cz + +- When reusing the old repositories during upgrade, copying also + 'autorefresh' and 'alias' (bnc #387261). +- Added software->dropped_packages into the control file to replace + 'delete old packages' (bnc #300540). +- 2.16.44 + +------------------------------------------------------------------- +Mon May 5 13:26:27 CEST 2008 - locilka@suse.cz + +- Typofix (bnc #386606). + +------------------------------------------------------------------- +Fri May 2 22:27:21 CEST 2008 - mzugec@suse.cz + +- Don't stop network (by killing dhcpcd) at the end of 1.st stage + (bnc #386588) + +------------------------------------------------------------------- Old: ---- yast2-installation-2.16.43.tar.bz2 New: ---- yast2-installation-2.16.44.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.X28083/_old 2008-05-07 21:51:33.000000000 +0200 +++ /var/tmp/diff_new_pack.X28083/_new 2008-05-07 21:51:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.16.43) +# spec file for package yast2-installation (Version 2.16.44) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-installation -Version: 2.16.43 +Version: 2.16.44 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.16.43.tar.bz2 +Source0: yast2-installation-2.16.44.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # PackageCallbacks::RegisterEmptyProgressCallbacks() @@ -107,7 +107,7 @@ Lukas Ocilka <locilka@suse.cz> %prep -%setup -n yast2-installation-2.16.43 +%setup -n yast2-installation-2.16.44 %build %{prefix}/bin/y2tool y2autoconf @@ -172,7 +172,19 @@ %doc %{prefix}/share/doc/packages/yast2-installation %exclude %{prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{prefix}/share/doc/packages/yast2-installation/README + %changelog +* Tue May 06 2008 locilka@suse.cz +- When reusing the old repositories during upgrade, copying also + 'autorefresh' and 'alias' (bnc #387261). +- Added software->dropped_packages into the control file to replace + 'delete old packages' (bnc #300540). +- 2.16.44 +* Mon May 05 2008 locilka@suse.cz +- Typofix (bnc #386606). +* Sat May 03 2008 mzugec@suse.cz +- Don't stop network (by killing dhcpcd) at the end of 1.st stage + (bnc #386588) * Wed Apr 30 2008 locilka@suse.cz - Adding name and alias tags to extrasources (irc #yast/today). - 2.16.43 ++++++ yast2-installation-2.16.43.tar.bz2 -> yast2-installation-2.16.44.tar.bz2 ++++++ ++++ 2992 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-installation-2.16.43/src/clients/inst_deploy_image.ycp new/yast2-installation-2.16.44/src/clients/inst_deploy_image.ycp --- old/yast2-installation-2.16.43/src/clients/inst_deploy_image.ycp 2008-04-28 16:25:06.000000000 +0200 +++ new/yast2-installation-2.16.44/src/clients/inst_deploy_image.ycp 2008-05-05 13:25:38.000000000 +0200 @@ -101,7 +101,7 @@ if (! download_handler_hit) { y2milestone ("DownloadHandler - first hit"); // twice more steps - ImageInstallation::AdjustProgressLayout ("deploying_images", (2 * _steps_for_one_image * size (images)), _("Deploying mages...")); + ImageInstallation::AdjustProgressLayout ("deploying_images", (2 * _steps_for_one_image * size (images)), _("Deploying Images...")); download_handler_hit = true; } @@ -197,7 +197,7 @@ ImageInstallation::SetDownloadTarImageProgress (MyProgressDownloadHandler); ImageInstallation::SetOverallDeployingProgress (OverallProgressHandler); -ImageInstallation::AdjustProgressLayout ("deploying_images", (_steps_for_one_image * size (images)), _("Deploying mages...")); +ImageInstallation::AdjustProgressLayout ("deploying_images", (_steps_for_one_image * size (images)), _("Deploying Images...")); Wizard::SetContents ( _("Deploying Installation Images"), 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-installation-2.16.43/src/clients/inst_extrasources.ycp new/yast2-installation-2.16.44/src/clients/inst_extrasources.ycp --- old/yast2-installation-2.16.43/src/clients/inst_extrasources.ycp 2008-04-30 11:54:55.000000000 +0200 +++ new/yast2-installation-2.16.44/src/clients/inst_extrasources.ycp 2008-04-30 12:24:08.000000000 +0200 @@ -78,7 +78,7 @@ // repository name (try) name, alias, (fallback) baseurl repo_prop["name"] = new_url["name"]:new_url["alias"]:new_url["baseurl"]:""; - // repository alias (trye) + // repository alias (try) alias, (fallback) baseurl repo_prop["alias"] = new_url["alias"]:new_url["baseurl"]:""; repo_prop["base_urls"] = [new_url["baseurl"]:""]; 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-installation-2.16.43/src/clients/inst_upgrade_urls.ycp new/yast2-installation-2.16.44/src/clients/inst_upgrade_urls.ycp --- old/yast2-installation-2.16.43/src/clients/inst_upgrade_urls.ycp 2008-04-22 12:22:56.000000000 +0200 +++ new/yast2-installation-2.16.44/src/clients/inst_upgrade_urls.ycp 2008-05-07 13:07:02.000000000 +0200 @@ -72,7 +72,7 @@ counter = counter + 1; - // bugzilla #300901 + // bnc #300901 boolean enabled = nil; if (is (xmlcontent["source","enabled","value"]:nil, boolean)) { @@ -220,10 +220,8 @@ return ret; } - // FIXME: collision when two different products with two different name - // use the very same URL (fix in 11.0) - string FindURLName (string baseurl) { - if (baseurl == "" || baseurl == nil) { + string FindURLName (string id) { + if (id == "" || id == nil) { y2error ("Base URL not defined!"); return nil; } @@ -231,7 +229,7 @@ string ret = nil; foreach (map one_url, urls, { - if (baseurl == one_url["url"]:"-A-" && one_url["name"]:"" != "") { + if (id == one_url["id"]:"-A-" && one_url["name"]:"" != "") { ret = one_url["name"]:""; break; } @@ -240,8 +238,8 @@ return ret; } - string FindURLType (string baseurl) { - if (baseurl == "" || baseurl == nil) { + string FindURLType (string id) { + if (id == "" || id == nil) { y2error ("Base URL not defined!"); return ""; } @@ -249,7 +247,7 @@ string ret = ""; foreach (map one_url, urls, { - if (baseurl == one_url["url"]:"-A-" && one_url["type"]:"" != "") { + if (id == one_url["id"]:"-A-" && one_url["type"]:"" != "") { ret = one_url["type"]:""; break; } @@ -298,7 +296,7 @@ if (new_urls != nil && new_urls != []) { foreach (map one_url_map, new_urls, { - // bugzilla #300901 + // bnc #300901 boolean enabled = nil; // mapping url (zypp-based) keys to keys used in pkg-bindings @@ -310,12 +308,42 @@ enabled = one_url_map["enabled"]:false; } + // bnc #387261 + boolean autorefresh = true; + + // mapping url (zypp-based) keys to keys used in pkg-bindings + if (is (one_url_map["autorefresh"]:0, integer)) { + autorefresh = (one_url_map["autorefresh"]:0 == 1); + } else if (is (one_url_map["autorefresh"]:"0", string)) { + autorefresh = (one_url_map["autorefresh"]:"0" == "1"); + } else if (is (one_url_map["autorefresh"]:false, boolean)) { + autorefresh = one_url_map["autorefresh"]:false; + } + + boolean keeppackages = true; + + // mapping url (zypp-based) keys to keys used in pkg-bindings + if (is (one_url_map["keeppackages"]:0, integer)) { + keeppackages = (one_url_map["keeppackages"]:0 == 1); + } else if (is (one_url_map["keeppackages"]:"0", string)) { + keeppackages = (one_url_map["keeppackages"]:"0" == "1"); + } else if (is (one_url_map["keeppackages"]:false, boolean)) { + keeppackages = one_url_map["keeppackages"]:false; + } + map <string, any> new_url_map = $[ + "autorefresh" : autorefresh, + "alias" : one_url_map["id"]:one_url_map["baseurl"]:"", "url" : one_url_map["baseurl"]:nil, "name" : (one_url_map["name"]:"" == "" ? one_url_map["id"]:"" : one_url_map["name"]:""), "enabled" : enabled, + "keeppackages" : keeppackages, ]; + if (haskey (one_url_map, "priority")) { + new_url_map["priority"] = one_url_map["priority"]:99; + } + // store the repo-type as well if (one_url_map["type"]:"" != "") { new_url_map["type"] = one_url_map["type"]:""; @@ -324,12 +352,15 @@ urls = add (urls, new_url_map); }); // Fallback, old URLs found - // 10.1, 10.2, 10.3 ... + // ... 10.1, 10.2 } else if (old_urls != nil && old_urls != []) { urls = old_urls; } urls = maplist (map one_url, urls, { + // unique ID + one_url["id"] = one_url["id"]:one_url["url"]:""; + one_url["url_will_be_enabled"] = FindCurrentURLStatus (tostring (one_url["url"]:"")); one_url["initial_url_status"] = one_url["url_will_be_enabled"]:false; return one_url; @@ -468,7 +499,7 @@ Wizard::SetTitleIcon ("yast-sw_source"); } - // See bugzilla #309317 + // See bnc #309317 string GetUniqueAlias (string alias_orig) { if (alias_orig == nil) alias_orig = ""; @@ -496,21 +527,58 @@ return alias; } + void AdjustRepoSettings (map & new_repo, string id) { + if (id == nil || id == "") { + y2error ("Undefined ID: %1", id); + return; + } + + foreach (map one_url, urls, { + if (one_url["id"]:"" == id) { + y2milestone ("Matching: %1", one_url); + + // alias needs to be unique + // bnc #309317 + // + // alias is taken from the system first + // bnc #387261 + // + new_repo["alias"] = GetUniqueAlias (one_url["alias"]:""); + + foreach (string key, ["autorefresh", "gpgcheck", "keeppackages"], { + if (haskey (one_url, key)) + new_repo[key] = one_url[key]:true; + }); + + if (haskey (one_url, "priority")) + new_repo["priority"] = one_url["priority"]:99; + + break; + } + }); + } + symbol AddOrRemoveSources () { list <integer> sources_to_remove = []; list <string> sources_to_add = []; - // bugzilla #308763 + map <string, string> id_to_url = $[]; + + // bnc #308763 list <string> sources_to_add_disabled = []; foreach (map one_source, urls, { string url = one_source["url"]:""; + string id = one_source["id"]:""; + + id_to_url[id] = url; + integer current_medianr = FindURLMediaNr (url); // Source should be enabled at the end if (one_source["url_will_be_enabled"]:nil == true) { if (current_medianr == nil) { - sources_to_add = add (sources_to_add, url); + sources_to_add = add (sources_to_add, id); } // Source should be disabled at the end @@ -521,7 +589,7 @@ } // will be added - sources_to_add_disabled = add (sources_to_add_disabled, url); + sources_to_add_disabled = add (sources_to_add_disabled, id); } }); @@ -547,7 +615,9 @@ if ((size (sources_to_add) > 0) && NetworkRunning()) { y2milestone ("Adding ENABLED repos: %1", sources_to_add); - foreach (string one_url, sources_to_add, { + foreach (string one_id, sources_to_add, { + string one_url = id_to_url[one_id]:""; + string repo_type = Pkg::RepositoryProbe (one_url, "/"); y2milestone ("Probed repository: %1 type: %2", one_url, repo_type); @@ -561,18 +631,16 @@ if (repo_name == nil) repo_name = ""; string pth = "/"; - // see bugzilla #310209 + // see bnc #310209 // Adding repositories with their correct names map <string, any> repoadd = $[ "enabled" : false, "name" : repo_name, "base_urls" : [one_url], "prod_dir" : pth, - // alias needs to be unique - // bugzilla #309317 - "alias" : GetUniqueAlias (one_url), "type" : repo_type, ]; + AdjustRepoSettings (repoadd, one_id); y2milestone ("Adding repo (enabled): %1", repoadd); integer new_id = Pkg::RepositoryAdd (repoadd); @@ -627,27 +695,27 @@ } // Adding the rest of sources in a disabled state - // bugzilla #326342 + // bnc #326342 if (size (sources_to_add_disabled) > 0) { y2milestone ("Adding DISABLED repos: %1", sources_to_add_disabled); - foreach (string one_url, sources_to_add_disabled, { + foreach (string one_id, sources_to_add_disabled, { + string one_url = id_to_url[one_id]:""; + string repo_name = FindURLName (one_url); // fallback if (repo_name == nil) repo_name = ""; string pth = "/"; - // see bugzilla #310209 + // see bnc #310209 // Adding repositories with their correct names map <string, any> repoadd = $[ "enabled" : false, "name" : repo_name, "base_urls" : [one_url], "prod_dir" : pth, - // alias needs to be unique - // bugzilla #309317 - "alias" : GetUniqueAlias (one_url), ]; + AdjustRepoSettings (repoadd, one_id); // do not probe! adding as disabled! string repo_type = FindURLType (one_url); 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-installation-2.16.43/src/clients/umount_finish.ycp new/yast2-installation-2.16.44/src/clients/umount_finish.ycp --- old/yast2-installation-2.16.43/src/clients/umount_finish.ycp 2008-04-17 11:08:36.000000000 +0200 +++ new/yast2-installation-2.16.44/src/clients/umount_finish.ycp 2008-05-06 09:37:46.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain@suse.cz> * - * $Id: umount_finish.ycp 45921 2008-04-01 09:38:27Z jsrain $ + * $Id: umount_finish.ycp 47293 2008-05-05 15:13:31Z mzugec $ * */ @@ -120,10 +120,12 @@ // all dhcpcd clients are shut down // - this should release /var/run/ directory + // don't stop network, not necessairly when unmount with "-l" option (bnc#386588) +/* if (umountLength > 0) { Internet::ShutdownAllLocalDHCPClients(); } - +*/ while (umountLength > 0) { umountLength = umountLength - 1; 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-installation-2.16.43/VERSION new/yast2-installation-2.16.44/VERSION --- old/yast2-installation-2.16.43/VERSION 2008-04-30 12:10:58.000000000 +0200 +++ new/yast2-installation-2.16.44/VERSION 2008-05-07 13:08:56.000000000 +0200 @@ -1 +1 @@ -2.16.43 +2.16.44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org