Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory
checked in at Mon Jul 25 13:03:44 CEST 2011.
--------
--- kiwi/kiwi.changes 2011-07-22 15:30:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-07-25
11:40:45.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Jul 25 11:28:44 CEST 2011 - m...@suse.de
+
+- v4.93.3 released
+
+-------------------------------------------------------------------
+Mon Jul 25 10:37:07 CEST 2011 - m...@suse.de
+
+- fixed deviceDisks setup in suse-dump. The code there should
+ check if imageDiskDevice has a value otherwise the sed call
+ will fail with an invalid expression
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.MfsYp1/_old 2011-07-25 13:03:22.000000000 +0200
+++ /var/tmp/diff_new_pack.MfsYp1/_new 2011-07-25 13:03:22.000000000 +0200
@@ -69,7 +69,7 @@
%endif
%endif
Summary: OpenSuSE - KIWI Image System
-Version: 4.93.2
+Version: 4.93.3
Release: 1
Group: System/Management
License: GPLv2
++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm
new/kiwi/modules/KIWIGlobals.pm
--- old/kiwi/modules/KIWIGlobals.pm 2011-07-22 15:26:57.000000000 +0200
+++ new/kiwi/modules/KIWIGlobals.pm 2011-07-25 11:30:12.000000000 +0200
@@ -40,7 +40,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "4.93.2";
+ $data{Version} = "4.93.3";
$data{Publisher} = "SUSE LINUX Products GmbH";
$data{Preparer} = "KIWI - http://kiwi.berlios.de";;
$data{ConfigName} = "config.xml";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2011-07-22 15:26:57.000000000 +0200
+++ new/kiwi/.revision 2011-07-22 15:26:57.000000000 +0200
@@ -1 +1 @@
-5f31fff1eb1c048ccacef6d59ac274b06224e421
+0986cc6905e2b9628d9e5745cd72274817e0fcf9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-dump
new/kiwi/system/boot/ix86/oemboot/suse-dump
--- old/kiwi/system/boot/ix86/oemboot/suse-dump 2011-07-15 16:58:11.000000000
+0200
+++ new/kiwi/system/boot/ix86/oemboot/suse-dump 2011-07-25 11:30:12.000000000
+0200
@@ -175,9 +175,15 @@
IFS=$IFS_ORIG
Echo "Searching harddrive for $OEMInstallType installation"
hwinfo=/usr/sbin/hwinfo
- deviceDisks=`$hwinfo --disk |\
- grep "Device File:" | cut -f2 -d: |\
- cut -f1 -d"(" | sed -e s"@$imageDiskDevice@@"`
+ if [ ! -z "$imageDiskDevice" ];then
+ deviceDisks=`$hwinfo --disk |\
+ grep "Device File:" | cut -f2 -d: |\
+ cut -f1 -d"(" | sed -e s"@$imageDiskDevice@@"`
+ else
+ deviceDisks=`$hwinfo --disk |\
+ grep "Device File:" | cut -f2 -d: |\
+ cut -f1 -d"("`
+ fi
export deviceDisks=`echo $deviceDisks`
if [ -z "$deviceDisks" ];then
systemException \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-dump
new/kiwi/system/boot/ppc/oemboot/suse-dump
--- old/kiwi/system/boot/ppc/oemboot/suse-dump 2011-07-15 16:58:11.000000000
+0200
+++ new/kiwi/system/boot/ppc/oemboot/suse-dump 2011-07-25 11:30:12.000000000
+0200
@@ -175,9 +175,15 @@
IFS=$IFS_ORIG
Echo "Searching harddrive for $OEMInstallType installation"
hwinfo=/usr/sbin/hwinfo
- deviceDisks=`$hwinfo --disk |\
- grep "Device File:" | cut -f2 -d: |\
- cut -f1 -d"(" | sed -e s"@$imageDiskDevice@@"`
+ if [ ! -z "$imageDiskDevice" ];then
+ deviceDisks=`$hwinfo --disk |\
+ grep "Device File:" | cut -f2 -d: |\
+ cut -f1 -d"(" | sed -e s"@$imageDiskDevice@@"`
+ else
+ deviceDisks=`$hwinfo --disk |\
+ grep "Device File:" | cut -f2 -d: |\
+ cut -f1 -d"("`
+ fi
export deviceDisks=`echo $deviceDisks`
if [ -z "$deviceDisks" ];then
systemException \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-dump
new/kiwi/system/boot/s390/oemboot/suse-dump
--- old/kiwi/system/boot/s390/oemboot/suse-dump 2011-07-15 16:58:12.000000000
+0200
+++ new/kiwi/system/boot/s390/oemboot/suse-dump 2011-07-25 11:30:12.000000000
+0200
@@ -175,9 +175,15 @@
IFS=$IFS_ORIG
Echo "Searching harddrive for $OEMInstallType installation"
hwinfo=/usr/sbin/hwinfo
- deviceDisks=`$hwinfo --disk |\
- grep "Device File:" | cut -f2 -d: |\
- cut -f1 -d"(" | sed -e s"@$imageDiskDevice@@"`
+ if [ ! -z "$imageDiskDevice" ];then
+ deviceDisks=`$hwinfo --disk |\
+ grep "Device File:" | cut -f2 -d: |\
+ cut -f1 -d"(" | sed -e s"@$imageDiskDevice@@"`
+ else
+ deviceDisks=`$hwinfo --disk |\
+ grep "Device File:" | cut -f2 -d: |\
+ cut -f1 -d"("`
+ fi
export deviceDisks=`echo $deviceDisks`
if [ -z "$deviceDisks" ];then
systemException \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
