From: Zhang Qiang <qiang.z.zhang@intel.com>
Date: Sun, 22 Jun 2014 10:42:27 +0000 (+0800)
Subject: fix: resolve skipped packages after %to_build ready
X-Git-Tag: 0.14~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=79789e9f5e844db0a924ea84ba9fac2a1507d635;p=tools%2Fdepanneur.git

fix: resolve skipped packages after %to_build ready

Change-Id: I85421f68c156f8dd62faf19f2f83506d2f2a1c01
Signed-off-by: Zhang Qiang <qiang.z.zhang@intel.com>
---

diff --git a/depanneur b/depanneur
index eddbe65..b64f2ed 100755
--- a/depanneur
+++ b/depanneur
@@ -1225,6 +1225,25 @@ sub resolve_deps {
     return @final;
 }
 
+sub resolve_skipped_packages() {
+    info("resolving skipped packages ...");
+    foreach my $name (keys %to_build) {
+        my $fn = $to_build{$name}->{filename};
+        my $version = $to_build{$name}->{version};
+        my $release = $to_build{$name}->{release};
+
+        my $src_rpm = "$srpm_repo_path/$name-$version-$release.src.rpm";
+        if (-f $src_rpm) {
+            if ($overwrite) {
+                info("*** overwriting $name-$version-$release $arch ***");
+            } else {
+                info("skipping $name-$version-$release $arch ");
+                push(@skipped, $name);
+            }
+        }
+    }
+}
+
 
 sub worker_thread {
     my ($name, $thread, $index) = @_;
@@ -1777,28 +1796,11 @@ my %packs = parse_packs($config, @packs);
 info("building repo metadata ...");
 refresh_repo();
 
-
-info("resolving skipped packages ...");
 # only check skipping & overwriting for none noinit/incremental build
 if ($noinit == 0 && $incremental == 0) {
-    foreach my $name (keys %to_build) {
-        my $fn = $to_build{$name}->{filename};
-        my $version = $to_build{$name}->{version};
-        my $release = $to_build{$name}->{release};
-
-        my $src_rpm = "$srpm_repo_path/$name-$version-$release.src.rpm";
-        if (-f $src_rpm) {
-            if ($overwrite) {
-                info("*** overwriting $name-$version-$release $arch ***");
-            } else {
-                info("skipping $name-$version-$release $arch ");
-                push(@skipped, $name);
-            }
-        }
-    }
+    resolve_skipped_packages();
 }
 
-
 info("package dependency resolving ...");
 update_pkgdeps();
 update_pkgddeps();
@@ -1835,8 +1837,12 @@ if (@bins) {
     }
 
     push @final, resolve_deps(\@tobuild, $deps_build, $rdeps_build, %packs);
-
     %to_build = parse_packs($config, @final);
+
+    @skipped = ();
+    if ($noinit == 0 && $incremental == 0) {
+        resolve_skipped_packages();
+    }
     update_pkgdeps();
     update_pkgddeps();
 }