Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Tue Jul 19 14:38:56 CEST 2011.
-------- --- kiwi/kiwi.changes 2011-07-18 11:57:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-07-19 11:17:48.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Jul 19 09:39:58 CEST 2011 - [email protected] + +- fixed evaluation of @UmountStack. There were some mount points + still active if $main::global->mount() is called multiple times + each mount() call causes a reset to the @UmountStack which means + some umount information got lost + +------------------------------------------------------------------- +Mon Jul 18 17:54:43 CEST 2011 - [email protected] + +- fix catalog handling failure on apple style medias + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.zOeDfK/_old 2011-07-19 14:35:43.000000000 +0200 +++ /var/tmp/diff_new_pack.zOeDfK/_new 2011-07-19 14:35:43.000000000 +0200 @@ -70,7 +70,7 @@ %endif Summary: OpenSuSE - KIWI Image System Version: 4.93.1 -Release: 3 +Release: 5 Group: System/Management License: GPLv2 Source: %{name}.tar.bz2 ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-06-12 21:49:13.000000000 +0200 +++ new/kiwi/.revision 2011-06-12 21:49:13.000000000 +0200 @@ -1 +1 @@ -ecdf521ada7a742a2366d145557bb6daaf3a96fc +b62beddc5db94b47049b45f082ea150533a6577d 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-15 16:58:11.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2011-07-19 11:07:02.000000000 +0200 @@ -140,6 +140,7 @@ #------------------------------------------ $this->{data} = \%data; $this->{kiwi} = $kiwi; + $this->{UmountStack} = []; return $this; } @@ -286,9 +287,9 @@ my %fsattr = $this -> checkFileSystem ($source); my $type = $fsattr{type}; my $cipher = $this->{data}->{LuksCipher}; + my @UmountStack = @{$this->{UmountStack}}; my $status; my $result; - my @UmountStack; #========================================== # Check result of filesystem detection #------------------------------------------ @@ -454,7 +455,7 @@ $kiwi -> warning ("UmountStack failed: $cmd: $status\n"); } } - $this->{UmountStack} = (); + $this->{UmountStack} = []; } #========================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIIsoLinux.pm new/kiwi/modules/KIWIIsoLinux.pm --- old/kiwi/modules/KIWIIsoLinux.pm 2011-07-15 16:58:11.000000000 +0200 +++ new/kiwi/modules/KIWIIsoLinux.pm 2011-07-19 11:07:02.000000000 +0200 @@ -821,6 +821,15 @@ close $ISO; return undef; } + my $applemedia = read_sector (0x00); + my $applemedia_id = substr($applemedia, 0x230, 19); + if ($applemedia_id eq "Apple_partition_map") { + $kiwi -> skipped (); + $kiwi -> info ("Apple partition does not need catalog relocation"); + $kiwi -> skipped (); + close $ISO; + return $this; + } my $new_location = $path_table - 1; my $eltorito_descr = read_sector (0x11); my $eltorito_id = substr($eltorito_descr, 0, 0x1e); @@ -918,6 +927,15 @@ close $ISO; return undef; } + my $applemedia = read_sector (0x00); + my $applemedia_id = substr($applemedia, 0x230, 19); + if ($applemedia_id eq "Apple_partition_map") { + $kiwi -> skipped (); + $kiwi -> info ("Apple partition does not need catalog relocation"); + $kiwi -> skipped (); + close $ISO; + return $this; + } my $eltorito_descr = read_sector (0x11); my $eltorito_id = substr($eltorito_descr, 0, 0x1e); if ($eltorito_id ne "\x00CD001\x01EL TORITO SPECIFICATION") { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
