Hello community, here is the log from the commit of package yast2-installation checked in at Fri Sep 14 16:09:16 CEST 2007. -------- --- yast2-installation/yast2-installation.changes 2007-09-05 14:55:00.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2007-09-13 16:21:19.000000000 +0200 @@ -1,0 +2,19 @@ +Thu Sep 13 16:18:30 CEST 2007 - locilka@suse.cz + +- Fixed inst_upgrade_urls to re-register sources with their + repository names taken from the upgraded system (#310209). +- 2.15.49 + +------------------------------------------------------------------- +Tue Sep 11 20:03:02 CEST 2007 - aschnell@suse.de + +- don't swapoff after 1st stage installation (bug #308121) +- 2.15.48 + +------------------------------------------------------------------- +Tue Sep 11 11:07:20 CEST 2007 - locilka@suse.cz + +- Calling ntp-client_finish instead of ntp_client_finish in the + inst_finish script (#309430). + +------------------------------------------------------------------- @@ -49 +68 @@ -- mark string for translation (#300268) +- mark string for translation (#300268) @@ -122 +141 @@ -- 2.15.36 +- 2.15.36 @@ -306 +325 @@ -- 2.15.28 +- 2.15.28 @@ -311 +330 @@ -- fixed spec requirements +- fixed spec requirements @@ -316 +335 @@ -- removed netsetup item from control files +- removed netsetup item from control files @@ -321 +340 @@ -- removed inst_netsetup item from control files +- removed inst_netsetup item from control files @@ -328 +347 @@ -- 2.15.27 +- 2.15.27 @@ -984 +1003 @@ - + @@ -992 +1011 @@ -- Timeout license in AutoYaST after 2 seconds (#206706). +- Timeout license in AutoYaST after 2 seconds (#206706). @@ -999 +1018 @@ -- added new configurable values for LVM/EVMS based proposals +- added new configurable values for LVM/EVMS based proposals @@ -1005 +1024 @@ - + @@ -1481 +1500 @@ -- added a please-wait string in registration (already translated) +- added a please-wait string in registration (already translated) @@ -1496 +1515 @@ -- 2.13.126 +- 2.13.126 @@ -1511 +1530 @@ -- 2.13.124 +- 2.13.124 @@ -1594 +1613 @@ -- 2.13.112 +- 2.13.112 @@ -1605 +1624 @@ -- fixed layouting in inst_ask_online_update (#177559) +- fixed layouting in inst_ask_online_update (#177559) @@ -1610 +1629 @@ -- let inst_suse_register ask to install mozilla-xulrunner if +- let inst_suse_register ask to install mozilla-xulrunner if @@ -1673 +1692 @@ -- 2.13.104 +- 2.13.104 @@ -1735 +1754 @@ -- 2.13.96 +- 2.13.96 @@ -1768 +1787 @@ - + @@ -1785 +1804 @@ -- Making "SLP Catalog" selection bigger (maximum ncurses size) +- Making "SLP Catalog" selection bigger (maximum ncurses size) @@ -1810 +1829 @@ -- Removed "Disagree with all" button (bug #163001) +- Removed "Disagree with all" button (bug #163001) @@ -1839 +1858 @@ -- added proxy support for registration browser (#165891) +- added proxy support for registration browser (#165891) @@ -1853 +1872 @@ -- 2.13.81 +- 2.13.81 @@ -1871 +1890 @@ -- 2.13.78 +- 2.13.78 @@ -1939 +1958 @@ -- changed control files according to (#165509) +- changed control files according to (#165509) @@ -1951 +1970 @@ -- added missing autoyast entries in suse_register.desktop +- added missing autoyast entries in suse_register.desktop @@ -1958 +1977 @@ -- 2.13.68 +- 2.13.68 @@ -1991 +2010 @@ -- 2.13.64 +- 2.13.64 @@ -1996 +2015 @@ -- flag for evms in control.SLES.xml needs to be true +- flag for evms in control.SLES.xml needs to be true @@ -2097 +2116 @@ -- included new desktop file in Makefile (162112) +- included new desktop file in Makefile (162112) @@ -2117 +2136 @@ -- late feature "force registration" for suse_register (aj, shorn) +- late feature "force registration" for suse_register (aj, shorn) @@ -2125 +2144 @@ -- 2.13.51 +- 2.13.51 @@ -2133 +2152 @@ -- 2.13.50 +- 2.13.50 @@ -2145 +2164 @@ -- 2.13.49 +- 2.13.49 @@ -2155 +2174 @@ -- fixed security issue: suse-ncc dummy user got his own group +- fixed security issue: suse-ncc dummy user got his own group @@ -2160 +2179 @@ -- added controlfile configured default settings for suse_register +- added controlfile configured default settings for suse_register @@ -2175 +2194 @@ -- 2.13.45 +- 2.13.45 @@ -2190 +2209 @@ -- 2.13.43 +- 2.13.43 @@ -2206 +2225 @@ -- 2.13.41 +- 2.13.41 @@ -2217 +2236 @@ -- patch to make the ComboBox appear longer in release_notes +- patch to make the ComboBox appear longer in release_notes @@ -2236 +2255 @@ -- 2.13.40 +- 2.13.40 @@ -2295 +2314 @@ -- 2.13.35 +- 2.13.35 @@ -2300 +2319 @@ -- 2.13.34 +- 2.13.34 @@ -2306 +2325 @@ -- new texts for registration module +- new texts for registration module @@ -2377 +2396 @@ -- added functionality to skip suse register and/or online update +- added functionality to skip suse register and/or online update @@ -2393 +2412 @@ -- enable media callbacks in the add-on product handling +- enable media callbacks in the add-on product handling @@ -2405 +2424 @@ -- reset package manager before installing patches +- reset package manager before installing patches @@ -2454 +2473 @@ -- 2.13.21 +- 2.13.21 @@ -2504 +2523 @@ -- new release notes module (multiple release notes) FATE: 120129 +- new release notes module (multiple release notes) FATE: 120129 @@ -2521 +2540 @@ -- save zypp.log from instsys +- save zypp.log from instsys @@ -2695 +2714 @@ -- merged proofread texts +- merged proofread texts @@ -2707 +2726 @@ - over the license agreement + over the license agreement @@ -2817 +2836 @@ -- 2.12.27 +- 2.12.27 Old: ---- yast2-installation-2.15.47.tar.bz2 New: ---- yast2-installation-2.15.49.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.i28807/_old 2007-09-14 16:09:01.000000000 +0200 +++ /var/tmp/diff_new_pack.i28807/_new 2007-09-14 16:09:01.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.15.47) +# spec file for package yast2-installation (Version 2.15.49) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,13 +11,13 @@ # norootforbuild Name: yast2-installation -Version: 2.15.47 +Version: 2.15.49 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.15.47.tar.bz2 -prefix: /usr +Source0: yast2-installation-2.15.49.tar.bz2 +Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-country yast2-devtools yast2-testsuite # Mode::live_installation BuildRequires: yast2 >= 2.15.38 @@ -63,16 +63,17 @@ Recommends: yast2-update Recommends: yast2-add-on PreReq: %fillup_prereq -BuildArchitectures: noarch +BuildArch: noarch Summary: YaST2 - Installation Parts + %package devel-doc -Version: 2.15.47 +Version: 2.15.49 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.15.47.tar.bz2 -prefix: /usr +Source0: yast2-installation-2.15.49.tar.bz2 +Prefix: /usr Requires: yast2-installation >= 2.15.34 PreReq: %fillup_prereq Summary: YaST2 - Installation Parts @@ -90,7 +91,6 @@ Jiri Srain <jsrain@suse.cz> Lukas Ocilka <locilka@suse.cz> - %description devel-doc System installation code as present on installation media. @@ -105,7 +105,7 @@ Lukas Ocilka <locilka@suse.cz> %prep -%setup -n yast2-installation-2.15.47 +%setup -n yast2-installation-2.15.49 %build %{prefix}/bin/y2tool y2autoconf @@ -168,7 +168,6 @@ %dir %{prefix}/share/doc/packages/yast2-installation %{prefix}/share/doc/packages/yast2-installation/COPYING %{prefix}/share/doc/packages/yast2-installation/COPYRIGHT.english - %readme %{prefix}/share/doc/packages/yast2-installation/README %files devel-doc @@ -179,6 +178,16 @@ %exclude %{prefix}/share/doc/packages/yast2-installation/README %changelog +* Thu Sep 13 2007 - locilka@suse.cz +- Fixed inst_upgrade_urls to re-register sources with their + repository names taken from the upgraded system (#310209). +- 2.15.49 +* Tue Sep 11 2007 - aschnell@suse.de +- don't swapoff after 1st stage installation (bug #308121) +- 2.15.48 +* Tue Sep 11 2007 - locilka@suse.cz +- Calling ntp-client_finish instead of ntp_client_finish in the + inst_finish script (#309430). * Wed Sep 05 2007 - locilka@suse.cz - Reinitializing variable for skipping add-on-related clients with its default value in inst_system_analysis (#305554). ++++++ yast2-installation-2.15.47.tar.bz2 -> yast2-installation-2.15.49.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.47/src/clients/inst_finish.ycp new/yast2-installation-2.15.49/src/clients/inst_finish.ycp --- old/yast2-installation-2.15.47/src/clients/inst_finish.ycp 2007-08-31 16:28:05.000000000 +0200 +++ new/yast2-installation-2.15.49/src/clients/inst_finish.ycp 2007-09-11 11:08:58.000000000 +0200 @@ -6,7 +6,7 @@ * Arvin Schnell <arvin@suse.de> * Jiri Srain <jsrain@suse.de> * - * $Id: inst_finish.ycp 40652 2007-08-31 14:28:04Z locilka $ + * $Id: inst_finish.ycp 40844 2007-09-11 09:08:57Z locilka $ * * Writes: * [target] /var/lib/YaST2/runme_at_boot run yast2 after initial boot @@ -79,7 +79,7 @@ "label" : _("Save installation settings"), "steps" : [ "network", - "ntp_client", + "ntp-client", "ssh_settings", "save_hw_status", "autoinst_scripts2", diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.47/src/clients/inst_upgrade_urls.ycp new/yast2-installation-2.15.49/src/clients/inst_upgrade_urls.ycp --- old/yast2-installation-2.15.47/src/clients/inst_upgrade_urls.ycp 2007-08-21 16:09:41.000000000 +0200 +++ new/yast2-installation-2.15.49/src/clients/inst_upgrade_urls.ycp 2007-09-13 16:13:43.000000000 +0200 @@ -205,6 +205,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) { y2error ("Base URL not defined!"); @@ -213,8 +215,8 @@ string ret = nil; - foreach (map one_url, already_registered_repos, { - if (baseurl == one_url["media_url"]:"-A-") { + foreach (map one_url, urls, { + if (baseurl == one_url["url"]:"-A-" && one_url["name"]:"" != "") { ret = one_url["name"]:""; break; } @@ -389,6 +391,34 @@ Wizard::SetTitleIcon ("yast-sw_source"); } + // See bugzilla #309317 + string GetUniqueAlias (string alias_orig) { + if (alias_orig == nil) alias_orig = ""; + + // all current aliases + list <string> aliases = maplist (integer i, Pkg::SourceGetCurrent(false), { + map info = Pkg::SourceGeneralData (i); + return info["alias"]:""; + }); + + // default + string alias = alias_orig; + + // repository alias must be unique + // if it already exists add "_<number>" suffix to it + integer idx = 1; + while (contains (aliases, alias)) { + alias = sformat("%1_%2", alias_orig, idx); + idx = idx + 1; + } + + if (alias_orig != alias) { + y2milestone ("Alias '%1' changed to '%2'", alias_orig, alias); + } + + return alias; + } + symbol AddOrRemoveSources () { list <integer> sources_to_remove = []; list <string> sources_to_add = []; @@ -431,19 +461,56 @@ // Remote repositories need network if ((size(sources_to_add) > 0) && NetworkRunning()) { y2milestone ("Adding repos: %1", sources_to_add); + foreach (string one_url, sources_to_add, { - integer new_id = Pkg::SourceCreate (one_url, "/"); + string repo_type = Pkg::RepositoryProbe (one_url, "/"); + y2milestone ("Probed repository: %1 type: %2", one_url, repo_type); + + if (repo_type == nil || repo_type == "NONE") { + y2error ("Cannot add repository"); + return; + } + + string repo_name = FindURLName (one_url); + // fallback + if (repo_name == nil) repo_name = ""; + string pth = "/"; + + // see bugzilla #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, + ]; + y2milestone ("Adding: %1", repoadd); + + integer new_id = Pkg::RepositoryAdd (repoadd); + if (new_id > -1) { - AddOnProduct::add_on_products = add ( - AddOnProduct::add_on_products, - $[ - "media" : new_id, - "media_url" : one_url, - "product_dir" : "/", - "product" : FindURLName (one_url), - "autoyast_product" : "", - ] - ); + boolean repo_refresh = Pkg::SourceRefreshNow (new_id); + y2milestone ("Repository refreshed: %1", repo_refresh); + + boolean repo_enable = Pkg::SourceSetEnabled (new_id, true); + y2milestone ("Repository enabled: %1", repo_enable); + + AddOnProduct::Integrate (new_id); + + map <string, string> prod = (map <string, string>) Pkg::SourceProductData (new_id); + y2milestone ("Product Data: %1", prod); + + AddOnProduct::add_on_products = add (AddOnProduct::add_on_products, $[ + "media" : new_id, + "media_url" : one_url, + "product_dir" : pth, + "product" : repo_name, + "autoyast_product" : "", + ]); } }); } @@ -529,4 +596,4 @@ y2milestone ("Returning %1", ret); return ret; -} \ No newline at end of file +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.47/startup/First-Stage/F10-cleanup new/yast2-installation-2.15.49/startup/First-Stage/F10-cleanup --- old/yast2-installation-2.15.47/startup/First-Stage/F10-cleanup 2007-05-18 10:44:04.000000000 +0200 +++ new/yast2-installation-2.15.49/startup/First-Stage/F10-cleanup 2007-09-12 11:10:28.000000000 +0200 @@ -5,11 +5,11 @@ #============================================= # 10) first stage done, cleanup and save level #--------------------------------------------- + # 10.1) reverse umount file systems... awk '/ \/mnt/{ print $2 }' /proc/mounts | sort -r | xargs --no-run-if-empty umount -# 10.2) turn off swap space (files and partitions) -swapoff -a -# 10.3) unmount update filesystem + +# 10.2) unmount update filesystem if [ "$UPDATE_MOUNTED" = true ];then umount /y2update fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.47/VERSION new/yast2-installation-2.15.49/VERSION --- old/yast2-installation-2.15.47/VERSION 2007-09-05 14:57:54.000000000 +0200 +++ new/yast2-installation-2.15.49/VERSION 2007-09-13 16:18:24.000000000 +0200 @@ -1 +1 @@ -2.15.47 +2.15.49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org