Hello community, here is the log from the commit of package kiwi checked in at Fri Jul 13 02:11:21 CEST 2007. -------- --- arch/i386/kiwi/kiwi.changes 2007-07-11 10:51:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-07-12 17:08:49.346639000 +0200 @@ -1,0 +2,9 @@ +Wed Jul 11 15:31:02 CEST 2007 - ms@suse.de + +- v1.45 +- fixed rpm validation expression in KIWIMigrate and change the + File::Find to prevent the call from following symlinks +- use http://software.opensuse.org/download/ within the URL + type opensuse://... + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.rO8609/_old 2007-07-13 02:10:54.000000000 +0200 +++ /var/tmp/diff_new_pack.rO8609/_new 2007-07-13 02:10:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 1.44) +# spec file for package kiwi (Version 1.45) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,7 +15,7 @@ BuildRequires: module-init-tools perl perl-XML-LibXML perl-libwww-perl screen smart syslinux Requires: perl perl-XML-LibXML perl-libwww-perl screen Summary: OpenSuSE - KIWI Image System -Version: 1.44 +Version: 1.45 Release: 1 Group: System/Management License: GPL v2 or later @@ -302,6 +302,12 @@ %{_datadir}/kiwi/image/xenboot/suse* %changelog +* Wed Jul 11 2007 - ms@suse.de +- v1.45 +- fixed rpm validation expression in KIWIMigrate and change the + File::Find to prevent the call from following symlinks +- use http://software.opensuse.org/download/ within the URL + type opensuse://... * Tue Jul 10 2007 - ms@suse.de - v1.44 - fixed use of undefined reference ++++++ kiwi.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2007-07-11 10:46:21.000000000 +0200 +++ new/kiwi/kiwi.pl 2007-07-12 15:27:32.000000000 +0200 @@ -33,6 +33,7 @@ #-------------------------------------------- our $Version = "1.44"; our $SchemeVersion = "1.4"; +our $openSUSE = "http://software.opensuse.org/download/"; #============================================ # Globals #-------------------------------------------- diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIMigrate.pm new/kiwi/modules/KIWIMigrate.pm --- old/kiwi/modules/KIWIMigrate.pm 2007-07-11 10:47:11.000000000 +0200 +++ new/kiwi/modules/KIWIMigrate.pm 2007-07-12 17:03:53.000000000 +0200 @@ -135,7 +135,8 @@ '\/var\/lib\/smart', # no smart data '\/var\/log', # no logs '\/var\/run', # no pid files - '\/media\/' # no media automount files + '\/media\/', # no media automount files + '\/var\/lib\/hardware\/' # no hwinfo hardware files ); if (defined $excl) { my @exclude = @{$excl}; @@ -421,10 +422,9 @@ #========================================== # Find files not packaged #------------------------------------------ - my @dirs = ($mount); my $wref = generateWanted (\%result); $kiwi -> info ("Inspecting root file system..."); - find ($wref, @dirs); + find ({ wanted => $wref, follow => 0 }, $mount ); $this -> cleanMount(); $kiwi -> done (); $kiwi -> info ("Inspecting RPM database [installed files]..."); @@ -472,10 +472,7 @@ $count = 1; $kiwi -> cursorOFF(); foreach my $check (@rpmcheck) { - if ($check =~ /^missing/) { - $count++; next; - } - if ($check =~ /(\/.*)/) { + if ($check =~ /^(\/.*)/) { my $file = $1; my $dir = qx (dirname $file); chomp $dir; my $ok = 1; @@ -504,12 +501,20 @@ @rpmcheck = sort keys %result; if (defined $demo) { $kiwi -> info ("Creating report for root tree: $dest/report"); + if (! open (FD,">$dest/report-files")) { + $kiwi -> failed (); + $kiwi -> error ("Couldn't create report file: $!"); + $kiwi -> failed (); + return undef; + } my @list = (); foreach my $file (@rpmcheck) { - my $data = quotemeta $file; - push (@list,$data); + print FD $file."\0"; } - my $data = qx(du -ch --time @list | column -t > $dest/report); + close FD; + my $file = "$dest/report-files"; + my $prog = "du -ch --time --files0-from"; + my $data = qx($prog $file 2>/dev/null > $dest/report); my $code = $? >> 8; if ($code != 0) { $kiwi -> failed (); @@ -517,6 +522,7 @@ $kiwi -> failed (); return undef; } + unlink $file; $kiwi -> done (); } else { $kiwi -> info ("Setting up custom root tree..."); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIURL.pm new/kiwi/modules/KIWIURL.pm --- old/kiwi/modules/KIWIURL.pm 2007-07-11 10:46:20.000000000 +0200 +++ new/kiwi/modules/KIWIURL.pm 2007-07-12 15:27:06.000000000 +0200 @@ -103,9 +103,8 @@ my $this = shift; my $module = shift; my $browser = LWP::UserAgent->new; - my $location = qw (http://ftp.opensuse.org/pub/opensuse); - my @types = qw (distribution repositories); - my @dists = qw (inst-source inst-source-extra repo/oss); + my $location = $main::openSUSE; + my @dists = qw (standard); my @urllist = (); my $kiwi = $this->{kiwi}; #========================================== @@ -115,23 +114,19 @@ return ( undef,undef ); } $module =~ s/opensuse:\/\///; - $module =~ s/:/:\//g; - if ((! defined $module) || ($module eq "/")) { + $module =~ s/\/$//; + $module =~ s/^\///; + if ((! defined $module) || ($module eq "")) { return ( undef,undef ); } #========================================== # Create urllist for later testing #------------------------------------------ - foreach my $type (@types) { - my $url = $location."/".$type."/".$module; - if ($type eq $types[1]) { - push @urllist,$url; - next; - } - foreach my $dist (@dists) { - my $newurl = $url."/".$dist; - push @urllist,$newurl; - } + foreach my $dist (@dists) { + my $url1 = $location.$module."/"; + my $url2 = $location.$module."/".$dist."/"; + push @urllist,$url1; + push @urllist,$url2; } #========================================== # Check url entries in urllist @@ -141,16 +136,11 @@ my $response = $browser -> request ( $request ); my $title = $response -> title (); if ((defined $title) && ($title !~ /not found/i)) { - $url =~ s/([^:])\/+/\1\//g; - if ($url =~ /repositories/) { - my $repourl = $url; - my $request = HTTP::Request->new (GET => $repourl."/repodata"); - my $answer = $browser -> request ( $request ); - my $title = $answer -> title (); - if ((defined $title) && ($title !~ /not found/i)) { - return ( $response,$url ); - } - } else { + my $repourl = $url; + my $request = HTTP::Request->new (GET => $repourl."/repodata"); + my $answer = $browser -> request ( $request ); + my $title = $answer -> title (); + if ((defined $title) && ($title !~ /not found/i)) { return ( $response,$url ); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIXML.pm new/kiwi/modules/KIWIXML.pm --- old/kiwi/modules/KIWIXML.pm 2007-07-09 14:53:07.000000000 +0200 +++ new/kiwi/modules/KIWIXML.pm 2007-07-12 15:57:57.000000000 +0200 @@ -693,12 +693,19 @@ # types refer to the package manager documentation # --- my $this = shift; + my $kiwi = $this->{kiwi}; my @node = $this->{repositNodeList} -> get_nodelist(); my %result; foreach my $element (@node) { my $type = $element -> getAttribute("type"); my $stag = $element -> getElementsByTagName ("source") -> get_node(1); my $source = $this -> resolveLink ( $stag -> getAttribute ("path") ); + if (($source =~ /^opensuse:\/\//) && ($type ne "rpm-md")) { + $kiwi -> done (); + $kiwi -> warning ("opensuse URL used, forcing repo type [rpm-md]"); + $type = "rpm-md"; + $element -> setAttribute ("type",$type); + } $result{$source} = $type; } return %result; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-10.1/config.xml new/kiwi/system/boot/isoboot/suse-10.1/config.xml --- old/kiwi/system/boot/isoboot/suse-10.1/config.xml 2007-06-19 16:13:43.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-10.1/config.xml 2007-07-12 15:46:32.000000000 +0200 @@ -42,7 +42,7 @@ <file name="drivers/net/*"/> </drivers> <repository type="yast2" status="replaceable"> - <!-- <source path="opensuse://SL-10.1"/> --> + <!--<source path="opensuse://openSUSE:10.1"/>--> <source path="/image/dist/full-10.1-i386"/> </repository> <packages type="image"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-10.2/config.xml new/kiwi/system/boot/isoboot/suse-10.2/config.xml --- old/kiwi/system/boot/isoboot/suse-10.2/config.xml 2007-06-19 16:13:43.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-10.2/config.xml 2007-07-12 15:44:27.000000000 +0200 @@ -43,7 +43,7 @@ <file name="drivers/net/*"/> </drivers> <repository type="yast2" status="replaceable"> - <source path="opensuse://10.2"/> + <source path="opensuse://openSUSE:10.2"/> <!--<source path="/image/dist/full-10.2-i386"/>--> </repository> <packages type="image"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-10.3/config.xml new/kiwi/system/boot/isoboot/suse-10.3/config.xml --- old/kiwi/system/boot/isoboot/suse-10.3/config.xml 2007-05-21 14:41:51.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-10.3/config.xml 2007-07-12 15:47:15.000000000 +0200 @@ -45,8 +45,7 @@ <file name="drivers/net/*"/> </drivers> <repository type="yast2" status="replaceable"> - <!--<source path="/image/CDs/full-i386"/>--> - <source path="/image/dist/full-10.2-i386"/> + <source path="/image/CDs/full-i386"/> </repository> <packages type="image"> <package name="bind-libs"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoinstboot/suse-10.1/config.xml new/kiwi/system/boot/isoinstboot/suse-10.1/config.xml --- old/kiwi/system/boot/isoinstboot/suse-10.1/config.xml 2007-06-19 16:13:38.000000000 +0200 +++ new/kiwi/system/boot/isoinstboot/suse-10.1/config.xml 2007-07-12 15:48:07.000000000 +0200 @@ -42,7 +42,7 @@ <file name="drivers/net/*"/> </drivers> <repository type="yast2" status="replaceable"> - <!-- <source path="opensuse://SL-10.1"/> --> + <!--<source path="opensuse://openSUSE:10.1"/>--> <source path="/image/dist/full-10.1-i386"/> </repository> <packages type="image"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoinstboot/suse-10.2/config.xml new/kiwi/system/boot/isoinstboot/suse-10.2/config.xml --- old/kiwi/system/boot/isoinstboot/suse-10.2/config.xml 2007-06-19 16:13:38.000000000 +0200 +++ new/kiwi/system/boot/isoinstboot/suse-10.2/config.xml 2007-07-12 15:44:44.000000000 +0200 @@ -42,7 +42,7 @@ <file name="drivers/net/*"/> </drivers> <repository type="yast2" status="replaceable"> - <source path="opensuse://10.2"/> + <source path="opensuse://openSUSE:10.2"/> </repository> <packages type="image"> <package name="bind-libs"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoinstboot/suse-10.3/config.xml new/kiwi/system/boot/isoinstboot/suse-10.3/config.xml --- old/kiwi/system/boot/isoinstboot/suse-10.3/config.xml 2007-04-05 16:01:51.000000000 +0200 +++ new/kiwi/system/boot/isoinstboot/suse-10.3/config.xml 2007-07-12 15:48:25.000000000 +0200 @@ -43,8 +43,7 @@ <file name="drivers/net/*"/> </drivers> <repository type="yast2" status="replaceable"> - <!--<source path="/image/CDs/full-i386"/>--> - <source path="/image/dist/full-10.2-i386"/> + <source path="/image/CDs/full-i386"/> </repository> <packages type="image"> <package name="bind-libs"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-10.1/config.xml new/kiwi/system/boot/netboot/suse-10.1/config.xml --- old/kiwi/system/boot/netboot/suse-10.1/config.xml 2007-04-25 10:50:24.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-10.1/config.xml 2007-07-12 15:48:43.000000000 +0200 @@ -36,7 +36,7 @@ <file name="drivers/net/*"/> </drivers> <repository type="yast2" status="replaceable"> - <source path="opensuse://SL-10.1"/> + <source path="opensuse://openSUSE:10.1"/> <!--<source path="/image/dist/full-10.1-i386"/>--> </repository> <packages type="image"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-10.2/config.xml new/kiwi/system/boot/netboot/suse-10.2/config.xml --- old/kiwi/system/boot/netboot/suse-10.2/config.xml 2007-06-19 16:13:37.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-10.2/config.xml 2007-07-12 15:18:37.000000000 +0200 @@ -37,7 +37,7 @@ <file name="drivers/net/*"/> </drivers> <repository type="yast2" status="replaceable"> - <source path="opensuse://10.2"/> + <source path="opensuse://openSUSE:10.2"/> <!--<source path="/image/dist/full-10.2-i386"/>--> </repository> <repository type="rpm-dir"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-10.3/config.xml new/kiwi/system/boot/netboot/suse-10.3/config.xml --- old/kiwi/system/boot/netboot/suse-10.3/config.xml 2007-06-21 15:50:03.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-10.3/config.xml 2007-07-12 15:48:55.000000000 +0200 @@ -41,7 +41,6 @@ <file name="drivers/net/*"/> </drivers> <repository type="yast2" status="replaceable"> - <!--<source path="opensuse://10.3"/>--> <source path="/image/CDs/full-i386"/> </repository> <packages type="image"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-10.2/config.xml new/kiwi/system/boot/usbboot/suse-10.2/config.xml --- old/kiwi/system/boot/usbboot/suse-10.2/config.xml 2007-04-05 16:01:51.000000000 +0200 +++ new/kiwi/system/boot/usbboot/suse-10.2/config.xml 2007-07-12 15:45:11.000000000 +0200 @@ -43,8 +43,8 @@ <file name="drivers/net/*"/> </drivers> <repository type="yast2" status="replaceable"> - <!--<source path="opensuse://10.2"/>--> - <source path="/image/dist/full-10.2-i386"/> + <source path="opensuse://openSUSE:10.2"/> + <!--<source path="/image/dist/full-10.2-i386"/>--> </repository> <packages type="image"> <package name="e2fsprogs"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-10.1/config.xml new/kiwi/system/boot/vmxboot/suse-10.1/config.xml --- old/kiwi/system/boot/vmxboot/suse-10.1/config.xml 2007-05-24 17:09:12.000000000 +0200 +++ new/kiwi/system/boot/vmxboot/suse-10.1/config.xml 2007-07-12 15:49:55.000000000 +0200 @@ -33,7 +33,7 @@ <file name="drivers/net/*"/> </drivers> <repository type="yast2" status="replaceable"> - <source path="opensuse://SL-10.1"/> + <source path="opensuse://openSUSE:10.1"/> <!--<source path="/image/dist/full-10.1-i386"/>--> </repository> <packages type="image"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-10.2/config.xml new/kiwi/system/boot/vmxboot/suse-10.2/config.xml --- old/kiwi/system/boot/vmxboot/suse-10.2/config.xml 2007-04-05 16:01:52.000000000 +0200 +++ new/kiwi/system/boot/vmxboot/suse-10.2/config.xml 2007-07-12 15:45:32.000000000 +0200 @@ -33,8 +33,8 @@ <file name="drivers/net/*"/> </drivers> <repository type="yast2" status="replaceable"> - <!--<source path="opensuse://10.2"/>--> - <source path="/image/dist/full-10.2-i386"/> + <source path="opensuse://openSUSE:10.2"/> + <!--<source path="/image/dist/full-10.2-i386"/>--> </repository> <packages type="image"> <package name="bind-libs"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-10.1/config.xml new/kiwi/system/boot/xenboot/suse-10.1/config.xml --- old/kiwi/system/boot/xenboot/suse-10.1/config.xml 2007-05-24 17:09:19.000000000 +0200 +++ new/kiwi/system/boot/xenboot/suse-10.1/config.xml 2007-07-12 15:50:28.000000000 +0200 @@ -37,8 +37,8 @@ <file name="drivers/net/*"/> </drivers> <repository type="yast2" status="replaceable"> - <!--<source path="opensuse://10.1"/>--> - <source path="/image/dist/full-10.1-i386"/> + <source path="opensuse://openSUSE:10.1"/> + <!--<source path="/image/dist/full-10.1-i386"/>--> </repository> <packages type="image"> <package name="e2fsprogs"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-10.2/config.xml new/kiwi/system/boot/xenboot/suse-10.2/config.xml --- old/kiwi/system/boot/xenboot/suse-10.2/config.xml 2007-04-05 16:01:52.000000000 +0200 +++ new/kiwi/system/boot/xenboot/suse-10.2/config.xml 2007-07-12 15:45:50.000000000 +0200 @@ -37,8 +37,8 @@ <file name="drivers/net/*"/> </drivers> <repository type="yast2" status="replaceable"> - <!--<source path="opensuse://10.2"/>--> - <source path="/image/dist/full-10.2-i386"/> + <source path="opensuse://openSUSE:10.2"/> + <!--<source path="/image/dist/full-10.2-i386"/>--> </repository> <packages type="image"> <package name="e2fsprogs"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-10.3/config.xml new/kiwi/system/boot/xenboot/suse-10.3/config.xml --- old/kiwi/system/boot/xenboot/suse-10.3/config.xml 2007-06-06 11:49:27.000000000 +0200 +++ new/kiwi/system/boot/xenboot/suse-10.3/config.xml 2007-07-12 15:50:43.000000000 +0200 @@ -37,7 +37,6 @@ <file name="drivers/net/*"/> </drivers> <repository type="yast2" status="replaceable"> - <!--<source path="opensuse://10.3"/>--> <source path="/image/CDs/full-i386"/> </repository> <packages type="image"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xennetboot/suse-10.1/config.xml new/kiwi/system/boot/xennetboot/suse-10.1/config.xml --- old/kiwi/system/boot/xennetboot/suse-10.1/config.xml 2007-04-19 14:10:14.000000000 +0200 +++ new/kiwi/system/boot/xennetboot/suse-10.1/config.xml 2007-07-12 15:51:03.000000000 +0200 @@ -32,7 +32,7 @@ <file name="drivers/net/*"/> </drivers> <repository type="yast2" status="replaceable"> - <source path="opensuse://SL-10.1"/> + <source path="opensuse://openSUSE:10.1"/> <!-- <source path="/image/dist/full-10.1-i386"/> --> </repository> <packages type="image"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xennetboot/suse-10.2/config.xml new/kiwi/system/boot/xennetboot/suse-10.2/config.xml --- old/kiwi/system/boot/xennetboot/suse-10.2/config.xml 2007-06-19 16:13:32.000000000 +0200 +++ new/kiwi/system/boot/xennetboot/suse-10.2/config.xml 2007-07-12 15:46:05.000000000 +0200 @@ -33,7 +33,7 @@ <file name="drivers/net/*"/> </drivers> <repository type="yast2" status="replaceable"> - <source path="opensuse://10.2"/> + <source path="opensuse://openSUSE:10.2"/> <!--<source path="/image/dist/full-10.2-i386"/>--> </repository> <repository type="rpm-dir"> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org