use oldpackstatus instead of packstatus.

Change-Id: Id6730b09218123abc7f1f5aafebe14ba00fb4f7f
Signed-off-by: Junghyun Kim <jh0822.kim@samsung.com>

1 files changed, 25 insertions, 25 deletions

diff --git a/src/backend/bs_sched b/src/backend/bs_sched
index d4ffde5..9d6a566 100755
--- a/src/backend/bs_sched
+++ b/src/backend/bs_sched
@@ -7498,18 +7498,18 @@ NEXTPRP:
     my $prjuseforbuildenabled = 1;
     $prjuseforbuildenabled = enabled($repoid, $projpacks->{$projid}->{'useforbuild'}, $prjuseforbuildenabled);
 
-    # copy old data over if we have missing packages
-    if ($projpacks->{$projid}->{'missingpackages'}) {
-      addretryevent({'type' => 'package', 'project' => $projid});
-    }
     # always restore previous packstatus information.
     $oldpackstatus = BSUtil::retrieve("$reporoot/$prp/$myarch/:packstatus", 1) || {};
     $oldpackstatus->{'packstatus'} ||= {};
     $oldpackstatus->{'packerror'} ||= {};
-    for my $packid (keys %{$oldpackstatus->{'packstatus'}}) {
-      next if $cychash{$packid};
-      $packstatus{$packid} = $oldpackstatus->{'packstatus'}->{$packid};
-      $packerror{$packid} = $oldpackstatus->{'packerror'}->{$packid} if $oldpackstatus->{'packerror'}->{$packid};
+    # copy old data over if we have missing packages
+    if ($projpacks->{$projid}->{'missingpackages'}) {
+      addretryevent({'type' => 'package', 'project' => $projid});
+      for my $packid (keys %{$oldpackstatus->{'packstatus'}}) {
+        next if $packs->{$packid};
+        $packstatus{$packid} = $oldpackstatus->{'packstatus'}->{$packid};
+        $packerror{$packid} = $oldpackstatus->{'packerror'}->{$packid} if $oldpackstatus->{'packerror'}->{$packid};
+      }
     }
 
     while (@cpacks) {
@@ -7567,14 +7567,14 @@ NEXTPRP:
           # BUILD_EXCLUDED is triggered only when the previous status was 'broken' or 'unresolvable'
           if( $pdata->{'error'} eq 'excluded' ) {
             #print "[",__LINE__,"] [$prp/$myarch/$packid] packstatus[$packid] = $packstatus{$packid}\n" if $packid eq 'amd';
-            if ( ($packstatus{$packid} // '') eq 'blocked' || 
-                 ($packstatus{$packid} // '') eq 'broken' || 
-                 ($packstatus{$packid} // '') eq 'unresolvable') {
+            if ( ($oldpackstatus->{'packstatus'}->{$packid} // '') eq 'blocked' ||
+                 ($oldpackstatus->{'packstatus'}->{$packid} // '') eq 'broken' ||
+                 ($oldpackstatus->{'packstatus'}->{$packid} // '') eq 'unresolvable') {
               my $build_info = { 'project'=>$projid,
-                                 'repository'=>$repoid, 
-                                 'arch'=>$myarch, 
-                                 'package'=>$packid, 
-                                 'detail'=>"", 
+                                 'repository'=>$repoid,
+                                 'arch'=>$myarch,
+                                 'package'=>$packid,
+                                 'detail'=>"",
                                  'time'=>time()};
               BSNotify::notify("BUILD_EXCLUDED", $build_info);
             }
@@ -7639,14 +7639,14 @@ NEXTPRP:
           # BUILD_EXCLUDED is triggered only when the previous status was 'broken' or 'unresolvable'
           if( $info->{'error'} eq 'excluded' ) {
             #print "[",__LINE__,"] [$prp/$myarch/$packid] packstatus[$packid] = $packstatus{$packid}\n" if $packid eq 'amd';
-            if ( ($packstatus{$packid} // '') eq 'blocked' || 
-                 ($packstatus{$packid} // '') eq 'broken' || 
-                 ($packstatus{$packid} // '') eq 'unresolvable') {
+            if ( ($oldpackstatus->{'packstatus'}->{$packid} // '') eq 'blocked' ||
+                 ($oldpackstatus->{'packstatus'}->{$packid} // '') eq 'broken' ||
+                 ($oldpackstatus->{'packstatus'}->{$packid} // '') eq 'unresolvable') {
               my $build_info = { 'project'=>$projid,
-                                 'repository'=>$repoid, 
-                                 'arch'=>$myarch, 
-                                 'package'=>$packid, 
-                                 'detail'=>"", 
+                                 'repository'=>$repoid,
+                                 'arch'=>$myarch,
+                                 'package'=>$packid,
+                                 'detail'=>"",
                                  'time'=>time()};
               BSNotify::notify("BUILD_EXCLUDED", $build_info);
             }
@@ -7744,9 +7744,9 @@ NEXTPRP:
       #generate notify an event.
 
       if ( $astatus eq 'excluded' &&
-          ( ($packstatus{$packid} // '') eq 'blocked' || 
-            ($packstatus{$packid} // '') eq 'broken' || 
-            ($packstatus{$packid} // '') eq 'unresolvable') ) {
+          ( ($oldpackstatus->{'packstatus'}->{$packid} // '') eq 'blocked' ||
+            ($oldpackstatus->{'packstatus'}->{$packid} // '') eq 'broken' ||
+            ($oldpackstatus->{'packstatus'}->{$packid} // '') eq 'unresolvable') ) {
         #print "[",__LINE__,"] [$prp/$myarch/$packid] packstatus[$packid] = $packstatus{$packid}\n";
         BSNotify::notify("BUILD_EXCLUDED", {'project'=>$projid, 'repository'=>$repoid, 'arch'=>$myarch, 'package'=>$packid, 'detail'=>$aerror, 'time'=>time()});
       }