run findunusedbr for docker version

diff --git a/cleanbuild-docker.sh b/cleanbuild-docker.sh
index 6bb6a19c99f849b59f596ed1d10a7665bb095604..1775014b06ce08c5119ad4a1890b23772e05a5ad 100755 (executable)
--- a/cleanbuild-docker.sh
+++ b/cleanbuild-docker.sh
@@ -53,6 +53,9 @@ docker exec --user=root $name cleanbuild/cleanup-la
 while true; do
        docker exec $name cleanbuild/teeboth $buildlog builder -nn -bb -R $package --define 'clean exit 0' && rc=$? || rc=$?
 
+       # reset findunusedbr state after deps install
+       docker exec --user=root $name cleanbuild/findunusedbr -c / rpm/packages/$package/$package.spec
+
        findbr=$package.findbr.log
        builddir=$(docker exec $name sh -c 'test ! -d rpm/BUILD/* || echo rpm/BUILD/*')
        if [ -z "$builddir" ]; then
@@ -72,6 +75,8 @@ while true; do
        # go for another try
        $installed_something && continue
 
+       docker exec --user=root $name cleanbuild/findunusedbr / rpm/packages/$package/$package.spec
+
        if [ $rc -eq 0 ]; then
                # finished ok, cleanup
                docker kill $name >/dev/null && docker rm $name >/dev/null || :

diff --git a/findunusedbr b/findunusedbr
index 03c172a8e794e05ad921e3a67acf21ffb7a2ed29..daf4c3784c010b0dc436abdb055ba9d8ca67417b 100755 (executable)
--- a/findunusedbr
+++ b/findunusedbr
@@ -79,9 +79,17 @@ sub check_files
        print "$rpm may be superfluous !\n";# unless $used;
 }
 
+sub rpm {
+       my @cmd = ("rpm", "--root=$chroot", @_);
+       open my $fh, '-|', @cmd or die "$!: @cmd";
+       my @data = <$fh>;
+       close $fh;
+       warn $! if $!;
+       return @data;
+}
 
 foreach my $rpm ( @rpms ) {
-       my @files = qx/rpm --root=$chroot -ql --what-provides "$rpm"/;
+       my @files = rpm("-ql", "--what-provides", "$rpm");
        next if $files[0] =~ /^no package provides/;
        #print "*** $rpm ***\n";
        if ( $clear ) {