Hello community,
here is the log from the commit of package yast2-update
checked in at Mon Aug 27 18:30:38 CEST 2007.
--------
--- yast2-update/yast2-update.changes 2007-08-23 15:23:22.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2007-08-27 14:20:54.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Aug 27 14:18:25 CEST 2007 - locilka@suse.cz
+
+- Calling Storage::DeviceMatchFstab with not-translated device name
+ instead of the translated one (Storage::GetTranslatedDevices)
+ (#304269).
+- 2.15.22
+
+-------------------------------------------------------------------
Old:
----
yast2-update-2.15.21.tar.bz2
New:
----
yast2-update-2.15.22.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.R12959/_old 2007-08-27 18:30:17.000000000 +0200
+++ /var/tmp/diff_new_pack.R12959/_new 2007-08-27 18:30:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-update (Version 2.15.21)
+# spec file for package yast2-update (Version 2.15.22)
#
# 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-update
-Version: 2.15.21
+Version: 2.15.22
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-update-2.15.21.tar.bz2
+Source0: yast2-update-2.15.22.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-packager yast2-storage yast2-testsuite
# package not really needed to be installed but this breaks the building cycle
@@ -35,12 +35,12 @@
Conflicts: yast2-storage < 2.15.4
Summary: YaST2 - Update
%package FACTORY
-Version: 2.15.21
+Version: 2.15.22
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-update-2.15.21.tar.bz2
+Source0: yast2-update-2.15.22.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools
Requires: yast2-update yast2
@@ -73,7 +73,7 @@
Jiri Srain
%prep
-%setup -n yast2-update-2.15.21
+%setup -n yast2-update-2.15.22
%build
%{prefix}/bin/y2tool y2autoconf
@@ -119,6 +119,11 @@
/usr/share/YaST2/clients/update.ycp
%changelog
+* Mon Aug 27 2007 - locilka@suse.cz
+- Calling Storage::DeviceMatchFstab with not-translated device name
+ instead of the translated one (Storage::GetTranslatedDevices)
+ (#304269).
+- 2.15.22
* Thu Aug 23 2007 - locilka@suse.cz
- Preselecting new kernel if recommended and installed kernels do
not match. Removing other kernels but kernel-xen (#302419).
++++++ yast2-update-2.15.21.tar.bz2 -> yast2-update-2.15.22.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.21/src/modules/RootPart.ycp new/yast2-update-2.15.22/src/modules/RootPart.ycp
--- old/yast2-update-2.15.21/src/modules/RootPart.ycp 2007-08-09 16:22:21.000000000 +0200
+++ new/yast2-update-2.15.22/src/modules/RootPart.ycp 2007-08-27 14:21:12.000000000 +0200
@@ -6,7 +6,7 @@
* Purpose: Responsible for searching of root partitions and
* mounting of target partitions.
*
- * $Id: RootPart.ycp 40132 2007-08-09 14:22:21Z locilka $
+ * $Id: RootPart.ycp 40499 2007-08-27 12:21:11Z locilka $
*/
{
module "RootPart";
@@ -596,11 +596,12 @@
*
* @param list <map> of definitions to translate
* @param string key name in map to translate
+ * @param string key name in map to keep the old value
* @return list <map> of translated definitions
*
* @see https://bugzilla.novell.com/show_bug.cgi?id=258222
*/
- define list <map> TranslateFsOrCryptoTab (list <map> translate, string key_to_translate) {
+ define list <map> TranslateFsOrCryptoTab (list <map> translate, string key_to_translate, string key_preserve_as) {
// Check whether there is any hardware information that could be used
string check_command = sformat ("/usr/bin/find '%1/var/lib/hardware/'", String::Quote (Installation::destdir));
map cmd = (map) SCR::Execute (.target.bash_output, check_command);
@@ -634,7 +635,8 @@
string new_val = new_names[i]:default_val;
translate[i, key_to_translate] = new_val;
- backward_translation[new_val] = default_val;
+ translate[i, key_preserve_as] = default_val;
+ backward_translation[new_val] = default_val;
i = i + 1;
};
@@ -747,11 +749,11 @@
Update::GetProductName();
y2milestone ("fstab: %1", fstab);
- fstab = TranslateFsOrCryptoTab (fstab, "spec");
+ fstab = TranslateFsOrCryptoTab (fstab, "spec", "spec_old");
y2milestone ("fstab: (translated) %1", fstab);
y2milestone ("crtab: %1", crtab);
- crtab = TranslateFsOrCryptoTab (crtab, "file");
+ crtab = TranslateFsOrCryptoTab (crtab, "file", "file_old");
y2milestone ("crtab: (translated) %1", crtab);
return true;
@@ -1373,7 +1375,9 @@
boolean ok = size(fstab[0,"spec"]:"")>0 &&
Storage::DeviceMatchFstab( p_dev,
- fstab[0,"spec"]:"" );
+ // bugzilla #304269
+ // DeviceMatchFstab expects _old_ not _translated_ device
+ fstab[0,"spec_old"]:fstab[0,"spec"]:"" );
// Why this doesn't match?
// Possible reasons:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.21/VERSION new/yast2-update-2.15.22/VERSION
--- old/yast2-update-2.15.21/VERSION 2007-08-24 15:32:06.000000000 +0200
+++ new/yast2-update-2.15.22/VERSION 2007-08-27 14:20:59.000000000 +0200
@@ -1 +1 @@
-2.15.21
+2.15.22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org