Hello community,
here is the log from the commit of package yast2-installation
checked in at Thu Sep 20 16:34:44 CEST 2007.
--------
--- yast2-installation/yast2-installation.changes 2007-09-18 19:52:23.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2007-09-20 12:29:59.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Sep 20 12:23:01 CEST 2007 - locilka@suse.cz
+
+- Changed inst_upgrade_urls to add sources not enabled during the
+ upgrade in a disabled state instead of ignoring them (#326342).
+- 2.15.51
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.15.50.tar.bz2
New:
----
yast2-installation-2.15.51.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.V15133/_old 2007-09-20 16:33:11.000000000 +0200
+++ /var/tmp/diff_new_pack.V15133/_new 2007-09-20 16:33:11.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.15.50)
+# spec file for package yast2-installation (Version 2.15.51)
#
# 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-installation
-Version: 2.15.50
+Version: 2.15.51
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.15.50.tar.bz2
+Source0: yast2-installation-2.15.51.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
@@ -67,12 +67,12 @@
Summary: YaST2 - Installation Parts
%package devel-doc
-Version: 2.15.50
+Version: 2.15.51
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.15.50.tar.bz2
+Source0: yast2-installation-2.15.51.tar.bz2
Prefix: /usr
Requires: yast2-installation >= 2.15.34
PreReq: %fillup_prereq
@@ -105,7 +105,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.15.50
+%setup -n yast2-installation-2.15.51
%build
%{prefix}/bin/y2tool y2autoconf
@@ -176,8 +176,11 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYRIGHT.english
%exclude %{prefix}/share/doc/packages/yast2-installation/README
-
%changelog
+* Thu Sep 20 2007 - locilka@suse.cz
+- Changed inst_upgrade_urls to add sources not enabled during the
+ upgrade in a disabled state instead of ignoring them (#326342).
+- 2.15.51
* Tue Sep 18 2007 - locilka@suse.cz
- Fixed tar syntax: --ignore-failed-read param. position (#326055).
- 2.15.50
++++++ yast2-installation-2.15.50.tar.bz2 -> yast2-installation-2.15.51.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.50/src/clients/inst_upgrade_urls.ycp new/yast2-installation-2.15.51/src/clients/inst_upgrade_urls.ycp
--- old/yast2-installation-2.15.50/src/clients/inst_upgrade_urls.ycp 2007-09-13 16:13:43.000000000 +0200
+++ new/yast2-installation-2.15.51/src/clients/inst_upgrade_urls.ycp 2007-09-20 15:09:01.000000000 +0200
@@ -225,6 +225,24 @@
return ret;
}
+ string FindURLType (string baseurl) {
+ if (baseurl == "" || baseurl == nil) {
+ y2error ("Base URL not defined!");
+ return "";
+ }
+
+ string ret = "";
+
+ foreach (map one_url, urls, {
+ if (baseurl == one_url["url"]:"-A-" && one_url["type"]:"" != "") {
+ ret = one_url["type"]:"";
+ break;
+ }
+ });
+
+ return ret;
+ }
+
void EditItem (integer currentitem) {
if (currentitem == nil || currentitem < 0) {
y2error ("Cannot edit item: %1", currentitem);
@@ -276,11 +294,18 @@
enabled = one_url_map["enabled"]:false;
}
- urls = add (urls, $[
+ map new_url_map = $[
"url" : one_url_map["baseurl"]:nil,
"name" : (one_url_map["name"]:"" == "" ? one_url_map["id"]:"" : one_url_map["name"]:""),
"enabled" : enabled,
- ]);
+ ];
+
+ // store the repo-type as well
+ if (one_url_map["type"]:"" != "") {
+ new_url_map["type"] = one_url_map["type"]:"";
+ }
+
+ urls = add (urls, new_url_map);
});
// Fallback, old URLs found
// 10.1, 10.2, 10.3 ...
@@ -423,7 +448,8 @@
list <integer> sources_to_remove = [];
list <string> sources_to_add = [];
-
+ // bugzilla #308763
+ list <string> sources_to_add_disabled = [];
foreach (map one_source, urls, {
string url = one_source["url"]:"";
@@ -434,11 +460,16 @@
if (current_medianr == nil) {
sources_to_add = add (sources_to_add, url);
}
+
// Source should be disabled at the end
} else if (one_source["url_will_be_enabled"]:nil == false) {
+ // already registered
if (current_medianr != nil) {
sources_to_remove = add (sources_to_remove, current_medianr);
}
+
+ // will be added
+ sources_to_add_disabled = add (sources_to_add_disabled, url);
}
});
@@ -459,8 +490,10 @@
});
// Remote repositories need network
- if ((size(sources_to_add) > 0) && NetworkRunning()) {
- y2milestone ("Adding repos: %1", sources_to_add);
+ // Adding sources in a disabled state, then enable them
+ // for the system upgrade
+ if ((size (sources_to_add) > 0) && NetworkRunning()) {
+ y2milestone ("Adding ENABLED repos: %1", sources_to_add);
foreach (string one_url, sources_to_add, {
string repo_type = Pkg::RepositoryProbe (one_url, "/");
@@ -488,7 +521,7 @@
"alias" : GetUniqueAlias (one_url),
"type" : repo_type,
];
- y2milestone ("Adding: %1", repoadd);
+ y2milestone ("Adding repo (enabled): %1", repoadd);
integer new_id = Pkg::RepositoryAdd (repoadd);
@@ -515,6 +548,41 @@
});
}
+ // Adding the rest of sources in a disabled state
+ // bugzilla #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, {
+ 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 repoadd = $[
+ "enabled" : false,
+ "name" : repo_name,
+ "base_urls" : [one_url],
+ "prod_dir" : pth,
+ // alias needs to be unique
+ // bugzilla #309317
+ "alias" : GetUniqueAlias (one_url),
+ ];
+
+ // do not probe! adding as disabled!
+ string repo_type = FindURLType (one_url);
+ if (repo_type != nil && repo_type != "") {
+ repoadd["type"] = repo_type;
+ }
+
+ y2milestone ("Adding repo (disabled): %1", repoadd);
+
+ integer new_id = Pkg::RepositoryAdd (repoadd);
+ });
+ }
+
return `next;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.50/VERSION new/yast2-installation-2.15.51/VERSION
--- old/yast2-installation-2.15.50/VERSION 2007-09-18 19:50:40.000000000 +0200
+++ new/yast2-installation-2.15.51/VERSION 2007-09-20 12:30:04.000000000 +0200
@@ -1 +1 @@
-2.15.50
+2.15.51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org