From 965dbb65e03238a457517e546eeb00f0b643bc9c Mon Sep 17 00:00:00 2001
From: Zhang Qiang <qiang.z.zhang@intel.com>
Date: Sat, 21 Jun 2014 15:28:13 +0800
Subject: [PATCH] resolving skipped pacakge in advance

skipped pacakges should be caculated more earlier, which may
avoid detect usless circles for building

Change-Id: Ibc540df62bb7416b7e4c84d0a610de70dd508f6a
Signed-off-by: Zhang Qiang <qiang.z.zhang@intel.com>
---
 depanneur | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/depanneur b/depanneur
index 62a4297..c8a3db5 100755
--- a/depanneur
+++ b/depanneur
@@ -1772,6 +1772,28 @@ 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);
+            }
+        }
+    }
+}
+
+
 info("package dependency resolving ...");
 update_pkgdeps();
 update_pkgddeps();
@@ -1834,28 +1856,6 @@ if ( ! -e "$rpm_repo_path" ) {
     createrepo ($arch, $dist);
 }
 
-# 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);
-            }
-        }
-    }
-    # refresh pkgdeps to remove skipped packages
-    update_pkgdeps();
-    update_pkgddeps();
-}
-
 
 # Signal handling
 $SIG{'INT'} = $SIG{'TERM'} = sub {
-- 
2.34.1