Hello community,
here is the log from the commit of package yast2-bootloader for
openSUSE:Factory checked in at 2011-10-24 12:52:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old)
and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader", Maintainer is "snw...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes
2011-10-19 00:56:38.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes
2011-10-24 14:03:36.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Oct 21 15:34:43 CEST 2011 - snw...@suse.de
+
+- yast2-storage uses fake uuids for btrfs handling; adjust our
+ code (bnc #707450)
+- 2.21.2
+
+-------------------------------------------------------------------
@@ -4,0 +12 @@
+- 2.21.1
Old:
----
yast2-bootloader-2.21.1.tar.bz2
New:
----
yast2-bootloader-2.21.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.iEs0WG/_old 2011-10-24 14:03:48.000000000 +0200
+++ /var/tmp/diff_new_pack.iEs0WG/_new 2011-10-24 14:03:48.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-bootloader
-Version: 2.21.1
+Version: 2.21.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.21.1.tar.bz2
+Source0: yast2-bootloader-2.21.2.tar.bz2
Prefix: /usr
@@ -68,7 +68,7 @@
This package contains the YaST2 component for bootloader configuration.
%prep
-%setup -n yast2-bootloader-2.21.1
+%setup -n yast2-bootloader-2.21.2
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-bootloader-2.21.1.tar.bz2 -> yast2-bootloader-2.21.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-2.21.1/VERSION
new/yast2-bootloader-2.21.2/VERSION
--- old/yast2-bootloader-2.21.1/VERSION 2011-10-18 13:44:27.000000000 +0200
+++ new/yast2-bootloader-2.21.2/VERSION 2011-10-21 15:33:27.000000000 +0200
@@ -1 +1 @@
-2.21.1
+2.21.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-bootloader-2.21.1/src/modules/BootStorage.ycp
new/yast2-bootloader-2.21.2/src/modules/BootStorage.ycp
--- old/yast2-bootloader-2.21.1/src/modules/BootStorage.ycp 2011-09-16
15:32:26.000000000 +0200
+++ new/yast2-bootloader-2.21.2/src/modules/BootStorage.ycp 2011-10-21
15:33:11.000000000 +0200
@@ -217,7 +217,8 @@
all_devices_created = 1;
}
// map partition by uuid
- if ((p["uuid"]:nil != "") && (p["uuid"]:nil != nil))
+ // watch out for fake uuids (shorter than 9 chars)
+ if (size(p["uuid"]:"") > 8)
{
dev_by_something =
"/dev/disk/by-uuid/"+p["uuid"]:"";
all_devices[dev_by_something]= p["device"]:"";
@@ -506,7 +507,8 @@
// convert to uuid
case (`uuid):
// partitions
- if ((partitions[tmp_dev, "uuid"]:nil != nil) &&
(partitions[tmp_dev, "uuid"]:nil != ""))
+ // watch out for fake uuids (shorter than 9 chars)
+ if (size(partitions[tmp_dev, "uuid"]:"") > 8)
{
ret = sformat ("/dev/disk/by-uuid/%1",
partitions[tmp_dev, "uuid"]:"");
y2milestone ("Device name: %1 is converted to
uuid: %2", tmp_dev, ret);
@@ -1116,8 +1118,9 @@
mountby = (symbol) partitions[dev, "mountby"]:nil;
if ( mountby == `uuid )
{
+ // watch out for fake uuids (shorter than 9 chars)
return sformat ("%1 (mount by UUID: %2)", dev,
- partitions[dev, "uuid"]:nil != nil ?
+ size(partitions[dev, "uuid"]:"") > 8 ?
partitions[dev, "uuid"]:"" :
"<UUID to be created later during format>");
} else if ( mountby == `label )
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
