fix using incorrect srpm and rpm hash to remove duplicated binary
authorZhang Qiang <qiang.z.zhang@intel.com>
Wed, 16 Oct 2013 09:19:55 +0000 (17:19 +0800)
committerZhang Qiang <qiang.z.zhang@intel.com>
Wed, 16 Oct 2013 09:24:07 +0000 (17:24 +0800)
Change-Id: I0cc3119bcb045f7bc1416d4454ab27e844edbbb1

depanneur

index 6cf27cd0fc508a482a665893e9a6be95dea0a132..540b5bfad47df6eb866b7fb4813c1b1e8494e4c1 100755 (executable)
--- a/depanneur
+++ b/depanneur
@@ -1421,12 +1421,12 @@ sub build_package {
         # Detach and terminate
         {
             lock($DETACHING);
-            if (my @rpms = bsd_glob "$scratch/home/abuild/rpmbuild/SRPMS/*.rpm") {
-                update_repo_with_rpms (\%rpmpaths, @rpms);
+            if (my @srpms = bsd_glob "$scratch/$srcrpmdirpath/*.rpm") {
+                update_repo_with_rpms(\%srpmpaths, @srpms);
                 my_system ("cp $scratch/$srcrpmdirpath/*.rpm $srpm_repo_path");
             }
-            if (my @srpms = bsd_glob "$scratch/home/abuild/rpmbuild/RPMS/*/*.rpm") {
-                update_repo_with_rpms(\%srpmpaths, @srpms);
+            if (my @rpms = bsd_glob "$scratch/$rpmdirpath/*/*.rpm") {
+                update_repo_with_rpms (\%rpmpaths, @rpms);
                 my_system ("cp $scratch/$rpmdirpath/*/*.rpm $rpm_repo_path");
             }