Changeset 5 for web/trunk/lib/Sophie/Base/RpmsPath.pm

Timestamp:

11/18/10 23:29:45 (14 years ago)

Author:

nanardon

Message:

• reverse sort of rpms to add new rpm before removing old
• trap error

File:

• web/trunk/lib/Sophie/Base/RpmsPath.pm (modified) (3 diffs)

web/trunk/lib/Sophie/Base/RpmsPath.pm

@@ -70 +70 @@
     }
 
-    foreach my $rpm (sort keys %list) {
+    foreach my $rpm (sort { $b cmp $a } keys %list) {
         if ($localrpms->{$rpm} && $baserpms->{$rpm}) {
             # nothing to do
@@ -109 +109 @@
     my ($self, $rpm) = @_;
 
-    my $header = RPM4::Header->new($self->path . '/' . $rpm) or do {
+    my $header;
+    eval {
+        $header = RPM4::Header->new($self->path . '/' . $rpm) 
+    };
+    $header or do {
         warn "Cannot read " . $self->path . '/' . $rpm;
         return;
@@ -128 +132 @@
     my $tmp = File::Temp->new( UNLINK => 1, SUFFIX => '.hdr' );
     unlink($tmp->filename);
-    $header->write($tmp);
+    $header->write($tmp, 0);
     seek($tmp, 0, 0);
     my $string = '';