Hello community, here is the log from the commit of package post-build-checks for openSUSE:Factory checked in at 2011-12-01 17:39:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-28 13:37:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.post-build-checks.new/post-build-checks.changes 2011-12-01 17:39:52.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Dec 1 16:36:29 UTC 2011 - [email protected] + +- fix usage of perl's index() + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ post-build-checks.spec ++++++ --- /var/tmp/diff_new_pack.NXfhUB/_old 2011-12-01 17:39:53.000000000 +0100 +++ /var/tmp/diff_new_pack.NXfhUB/_new 2011-12-01 17:39:53.000000000 +0100 @@ -15,16 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: post-build-checks -License: GPLv2+ +License: GPL-2.0+ Group: Development/Tools/Building -AutoReqProv: on Summary: post checks for build after rpms have been created Version: 1.0 -Release: 95 +Release: 0 PreReq: aaa_base permissions sed Url: http://gitorious.org/opensuse/post-build-checks # ++++++ new.diff ++++++ --- /var/tmp/diff_new_pack.NXfhUB/_old 2011-12-01 17:39:53.000000000 +0100 +++ /var/tmp/diff_new_pack.NXfhUB/_new 2011-12-01 17:39:53.000000000 +0100 @@ -1,7 +1,7 @@ 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-28 12:46:09.048680204 +0100 ++++ post-build-checks-1.0/checks/09-check-packaged-twice 2011-12-01 17:36:22.894836849 +0100 @@ -1,61 +1,74 @@ -#!/usr/bin/perl +#!/usr/bin/perl -w @@ -48,7 +48,8 @@ -if ( $#RPMS < 1 ) { - exit 0; -+open (ALL_RPMS, "find $build_root$TOPDIR/RPMS -name \"*.rpm\" |"); ++print "chroot $build_root find $TOPDIR/RPMS -name \"*.rpm\"\n"; ++open (ALL_RPMS, "chroot $build_root find $TOPDIR/RPMS/ -name \"*.rpm\" |"); +my @rpms = <ALL_RPMS>; +chomp @rpms; +close ALL_RPMS; @@ -59,7 +60,6 @@ +my %pkg2rpm; + +for my $rpm (@rpms) { -+ $rpm =~ s/^$build_root//; + open (FILES, "chroot $build_root rpm -qp --qf '[%{FILEMODES:perms} F:%{FILEFLAGS:fflags} %{NAME} %{FILENAMES}\n]' $rpm|"); + my @files = <FILES>; + chomp @files; @@ -108,7 +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 (index($allfiles{$file}->{$p1}, 'g') != -1) && (index($allfiles{$file}->{$p2}, 'g') != -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]
