Hello community, here is the log from the commit of package post-build-checks for openSUSE:Factory checked in at 2011-11-28 13:37:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/post-build-checks (Old) and /work/SRC/openSUSE:Factory/.post-build-checks.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "post-build-checks", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/post-build-checks/post-build-checks.changes 2011-11-26 08:28:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.post-build-checks.new/post-build-checks.changes 2011-11-28 13:37:57.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 28 11:46:44 UTC 2011 - [email protected] + +- ignore files that are %ghost in both packages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ new.diff ++++++ --- /var/tmp/diff_new_pack.LVCUWY/_old 2011-11-28 13:37:58.000000000 +0100 +++ /var/tmp/diff_new_pack.LVCUWY/_new 2011-11-28 13:37:58.000000000 +0100 @@ -1,8 +1,8 @@ Index: post-build-checks-1.0/checks/09-check-packaged-twice =================================================================== --- post-build-checks-1.0.orig/checks/09-check-packaged-twice 2011-10-20 11:57:54.000000000 +0200 -+++ post-build-checks-1.0/checks/09-check-packaged-twice 2011-11-25 19:07:11.509942810 +0100 -@@ -1,61 +1,73 @@ ++++ post-build-checks-1.0/checks/09-check-packaged-twice 2011-11-28 12:46:09.048680204 +0100 +@@ -1,61 +1,74 @@ -#!/usr/bin/perl +#!/usr/bin/perl -w # search for files packaged more than once @@ -60,16 +60,16 @@ + +for my $rpm (@rpms) { + $rpm =~ s/^$build_root//; -+ open (FILES, "chroot $build_root rpm -qp --qf '[%{FILEMODES:perms} %{NAME} %{FILENAMES}\n]' $rpm|"); ++ open (FILES, "chroot $build_root rpm -qp --qf '[%{FILEMODES:perms} F:%{FILEFLAGS:fflags} %{NAME} %{FILENAMES}\n]' $rpm|"); + my @files = <FILES>; + chomp @files; + close FILES; + # ignore dirs + @files = grep {!/^d/} @files; + for my $file (@files) { -+ next unless $file =~ /^\S+ (\S+) (.*)$/; -+ $allfiles{$2}->{$1} = 1; -+ $pkg2rpm{$1} = $rpm; ++ next unless $file =~ /^\S+ F:(\S*) (\S+) (.*)$/; ++ $allfiles{$3}->{$2} = $1; ++ $pkg2rpm{$2} = $rpm; + } } @@ -108,6 +108,7 @@ + while (@pkgs) { + my $p1 = shift @pkgs; + for my $p2 (@pkgs) { ++ next if (index('g', $allfiles{$file}->{$p1}) != -1) && (index('g', $allfiles{$file}->{$p2}) != -1); + next if conflicts($pkg2rpm{$p1}, $pkg2rpm{$p2}) || conflicts($pkg2rpm{$p2}, $pkg2rpm{$p1}); + print "ERROR: $file is packaged in both $p1 and $p2, and the packages do not conflict\n"; + $had_errors = 1; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
