From: Zhang Qiang <qiang.z.zhang@intel.com>
Date: Sat, 8 Sep 2012 05:44:40 +0000 (+0800)
Subject: Ignore exclude packages in parsing phrase
X-Git-Tag: 0.1~28
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=31c4e7661d8fc760c6ca23f8668ba689ccadb4f5;p=tools%2Fdepanneur.git

Ignore exclude packages in parsing phrase

skip exclude packages while parsing packs, and don't need care about
exclude packages in build scheduler, and make scheduler more clear.

Change-Id: I02be218bf0c329d6953feea5b61759dd5e0c2a3d
---

diff --git a/depanneur b/depanneur
index 8236129..e177861 100755
--- a/depanneur
+++ b/depanneur
@@ -452,6 +452,9 @@ sub parse_packs {
         my $release = $pack->{release};
         my @buildrequires = $pack->{deps};
         my @subpacks = $pack->{subpacks};
+        if ( (grep $_ eq $name, @exclude) ) {
+            next;
+        }
         $packs{$name} = {
             name => $name,
             version => $version,
@@ -922,18 +925,16 @@ if ( ! -e "$localrepo/$dist/$arch/RPMS" ) {
 }
 
 foreach my $name (keys %to_build) {
-    if( ! (grep $_ eq $name, @done) && ! (grep $_ eq $name, @exclude)) {
-        my $fn = $to_build{$name}->{filename};
-        my $version = $to_build{$name}->{version};
-        my $release = $to_build{$name}->{release};
-        my $pattern = "$localrepo/$dist/src/SRPMS/$name-$version-$release.*.rpm";
-        my @binaries = glob $pattern;
-        if (@binaries != 0 && ! $overwrite) {
-            info("skipping $name-$version-$release $arch ");
-            push(@skipped, $name);
-        } elsif (@binaries != 0 && $overwrite) {
-            info("*** overwriting $name-$version-$release $arch ***");
-        }
+    my $fn = $to_build{$name}->{filename};
+    my $version = $to_build{$name}->{version};
+    my $release = $to_build{$name}->{release};
+    my $pattern = "$localrepo/$dist/src/SRPMS/$name-$version-$release.*.rpm";
+    my @binaries = glob $pattern;
+    if (@binaries != 0 && ! $overwrite) {
+        info("skipping $name-$version-$release $arch ");
+        push(@skipped, $name);
+    } elsif (@binaries != 0 && $overwrite) {
+        info("*** overwriting $name-$version-$release $arch ***");
     }
 }
 
@@ -951,7 +952,6 @@ while (! $TERM) {
     #print " " . $_ . "\n" foreach (@o);
     foreach my $name (keys %to_build) {
         if( ! (grep $_ eq $name, @done) && 
-            ! (grep $_ eq $name, @exclude) && 
             ! (grep $_ eq $name, @skipped)) 
         {
             my $fn = $to_build{$name}->{filename};