From: Zhang Qiang <qiang.z.zhang@intel.com>
Date: Wed, 29 Aug 2012 07:19:16 +0000 (+0800)
Subject: more code optimizations
X-Git-Tag: 0.1~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5f7ef5c88d3a35dcee2d560a78d764cdf8991b4;p=tools%2Fdepanneur.git

more code optimizations

1) move creating repo cache code out from scheduler loop, and repo
cache should be generated before using it, or --binary will fail
to find repo cache file.
2) move finding skipped list packages out of sched loop

Change-Id: I5278d8183b5a635c41ac3176c1a09420c8617ff0
---

diff --git a/depanneur b/depanneur
index c2aed5a..5603f3d 100755
--- a/depanneur
+++ b/depanneur
@@ -771,6 +771,26 @@ foreach my $sp (@original_specs) {
 }
 
 print "Parsing package data...\n";
+
+if (! $turbu) {
+    print "Retrieving repo metadata...\n";
+    my $repos_setup = 1;
+    system("> $order_dir/.repo.cache");
+    foreach my $repo (@package_repos) {
+        my $cmd = "$build_dir/createrepomddeps --cachedir=$order_dir $repo >> $order_dir/.repo.cache ";
+        debug($cmd);
+        if ( system($cmd) == 0 ) {
+            system("echo D: >> $order_dir/.repo.cache");
+        } else {
+            $repos_setup = 0;
+        }
+    }
+    if ($repos_setup == 0 ) {
+        print "repo cache creation failed...\n";
+        exit(1);
+    }
+}
+
 my %packs = parse_packs($config, @packs);
 
 if ($binarylist ne "" && -e $binarylist ) {
@@ -863,44 +883,25 @@ if ( ! -e "$localrepo/$dist/$arch/RPMS" ) {
     createrepo ($arch, $dist);
 }
 
-while (! $TERM) {
-    my @order = ();
-    if (! $turbu) {
-        my $repos_setup = 1;
-        system("> $order_dir/.repo.cache");
-        if ( system("$build_dir/createrpmdeps $localrepo/$dist/$arch/RPMS >> $order_dir/.repo.cache ") != 0 ) {
-            $repos_setup = 0;
-        }
-        system("echo D: >> $order_dir/.repo.cache");
-        foreach my $repo (@package_repos) {
-            my $cmd = "$build_dir/createrepomddeps --cachedir=$order_dir $repo >> $order_dir/.repo.cache ";
-            debug($cmd);
-            if ( system($cmd) == 0 ) {
-                system("echo D: >> $order_dir/.repo.cache");
-            } else {
-                $repos_setup = 0;
-            }
-        }
-        if ($repos_setup == 0 ) {
-            print "repo cache creation failed...\n";
-            exit(1);
-        }
-    }
-    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 $dist");
-                push(@skipped, $name);
-            } elsif (@binaries != 0 && $overwrite) {
-                print "*** overwriting $name-$version-$release $arch $dist ***\n";
-            }
+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) {
+            print "*** overwriting $name-$version-$release $arch ***\n";
         }
     }
+}
+
+
+while (! $TERM) {
+    my @order = ();
     my @o = ();
     #foreach my $name (keys %to_build) {
     #    push(@o,$name);