Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2011-10-27 19:32:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2011-10-27 14:27:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2011-10-27 19:36:00.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Oct 27 15:26:53 CEST 2011 - [email protected] + +- v4.98.10 released + +------------------------------------------------------------------- +Thu Oct 27 15:24:38 CEST 2011 - [email protected] + +- removed __checkNameValid() checker function and make sure + that an arch string as part of the name attribute doesn't + cause any trouble (bnc #716992) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.0kfHOe/_old 2011-10-27 19:36:03.000000000 +0200 +++ /var/tmp/diff_new_pack.0kfHOe/_new 2011-10-27 19:36:03.000000000 +0200 @@ -69,7 +69,7 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.98.9 +Version: 4.98.10 Release: 1 Group: System/Management License: GPLv2 ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-10-26 14:47:33.000000000 +0200 +++ new/kiwi/.revision 2011-10-26 14:47:33.000000000 +0200 @@ -1 +1 @@ -a51e9ba7f4de49d0f01a3828470de48234ad38f5 +2f88fd27e0501929aeecd5408c0edd4bb4eb7e05 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-10-27 12:39:26.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2011-10-27 15:33:03.000000000 +0200 @@ -40,7 +40,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "4.98.9"; + $data{Version} = "4.98.10"; $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/modules/KIWIXMLValidator.pm new/kiwi/modules/KIWIXMLValidator.pm --- old/kiwi/modules/KIWIXMLValidator.pm 2011-10-27 12:39:26.000000000 +0200 +++ new/kiwi/modules/KIWIXMLValidator.pm 2011-10-27 15:33:03.000000000 +0200 @@ -265,28 +265,6 @@ } #========================================== -# __checkNameValid -#------------------------------------------ -sub __checkNameValid { - # ... - # Check if arch string is part of the name which is not allowed - # --- - my $this = shift; - my @imgNodes = $this->{systemTree} -> getElementsByTagName('image'); - # There is only one image node, it is the root node - my $name = $imgNodes[0] -> getAttribute('name'); - if (($name) && ($name =~ /i586|i686|x86_64|ppc|ppc64|s390|s390x/)) { - my $kiwi = $this->{kiwi}; - my $msg = 'Found arch string provided in name. ' - . 'No arch string permitted'; - $kiwi -> error ( $msg ); - $kiwi -> failed (); - return undef; - } - return 1; -} - -#========================================== # __checkEC2IsFsysType #------------------------------------------ sub __checkEC2IsFsysType { @@ -907,9 +885,6 @@ if (! $this -> __checkDisplaynameValid()) { return undef; } - if (! $this -> __checkNameValid()) { - return undef; - } if (! $this -> __checkEC2IsFsysType()) { return undef; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-linuxrc new/kiwi/system/boot/ix86/isoboot/suse-linuxrc --- old/kiwi/system/boot/ix86/isoboot/suse-linuxrc 2011-10-25 15:40:01.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/suse-linuxrc 2011-10-27 15:33:03.000000000 +0200 @@ -117,8 +117,9 @@ 2) imageVersion=$n esac done + IFS=$IFS_ORIG imageReadOnly="$imageName" - imageReadOnly=`echo $imageReadOnly | sed -e s@.$ARCH@@` + imageReadOnly=$(echo $imageReadOnly | sed -e "s@\.${ARCH}\$@@") imageReadOnly="$imageReadOnly-read-only.$ARCH-$imageVersion" imageName="/cdrom/$imageName-$imageVersion" gzippName=$imageName.gz @@ -127,7 +128,6 @@ continue fi while true;do - IFS=" " read sum1 blocks blocksize zblocks zblocksize < $imageMD5s if ! validateSize;then systemException \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
