Changeset 418

Timestamp:

11/16/11 13:11:07 (12 years ago)

Author:

nanardon

Message:

• don't add/remove rpms if directory is missing

File:

• server/trunk/web/lib/Sophie/Scan/RpmsPath.pm (modified) (1 diff)

server/trunk/web/lib/Sophie/Scan/RpmsPath.pm

@@ -73 +73 @@
     if ($localrpms) {
         push(@delta, { delta => 'DE' });
+
+        my %list;
+        foreach (keys %{ $localrpms || {} }, keys %{ $baserpms }) {
+            $list{$_} = 1;
+        }
+
+        foreach my $rpm (sort { $b cmp $a } keys %list) {
+            if ($localrpms->{$rpm} && $baserpms->{$rpm}) {
+                # nothing to do
+            } elsif ($localrpms->{$rpm}) {
+                push(@delta, { rpm => $rpm, delta => 'A', mtime => $localrpms->{$rpm} });
+            } elsif ($baserpms->{$rpm}) {
+                push(@delta, { rpm => $rpm, delta => 'R', mtime => $baserpms->{$rpm} });
+            }
+        }
+        sort { $a->{delta} eq $b->{delta} 
+            ? ($a->{mtime} <=> $b->{mtime})
+            : ($a->{delta} cmp $b->{delta})
+        } @delta;
     } else {
         push(@delta, { delta => 'DM' });
     }
-
-
-    my %list;
-    foreach (keys %{ $localrpms || {} }, keys %{ $baserpms }) {
-        $list{$_} = 1;
-    }
-
-    foreach my $rpm (sort { $b cmp $a } keys %list) {
-        if ($localrpms->{$rpm} && $baserpms->{$rpm}) {
-            # nothing to do
-        } elsif ($localrpms->{$rpm}) {
-            push(@delta, { rpm => $rpm, delta => 'A', mtime => $localrpms->{$rpm} });
-        } elsif ($baserpms->{$rpm}) {
-            push(@delta, { rpm => $rpm, delta => 'R', mtime => $baserpms->{$rpm} });
-        }
-    }
-    sort { $a->{delta} eq $b->{delta} 
-        ? ($a->{mtime} <=> $b->{mtime})
-        : ($a->{delta} cmp $b->{delta})
-    } @delta;
 }