Changeset 153

Timestamp:

12/15/05 21:23:49 (18 years ago)

Author:

thauvin

Message:

• backport seterror call fix

Location:

branches/v0_1/soft/ObsData/ObsData/Archive

Files:

• Compressed.pm (modified) (3 diffs, 1 prop)
• Tar.pm (modified) (2 diffs, 1 prop)

branches/v0_1/soft/ObsData/ObsData/Archive/Compressed.pm

@@ -43 +43 @@
         $fname = $dest;
         open($fh, '>', $dest) or do {
-            seterror("Can't uncompress archive: $!");
+            $self->seterror("Can't uncompress archive: $!");
             return undef;
         };
@@ -51 +51 @@
             UNLINK => 1,
         ) or do {
-            seterror("Can't create temp file: $!");
+            $self->seterror("Can't create temp file: $!");
             return undef;
         };
@@ -59 +59 @@
     
     if(!copy($sourcefh, $fh)) {
-        seterror("Can't copy file to destination: $!");
+        $self->seterror("Can't copy file to destination: $!");
         unlink($fname);
         return undef;

branches/v0_1/soft/ObsData/ObsData/Archive/Tar.pm

@@ -52 +52 @@
     
     if(!chdir($tempdir)) {
-        seterror("Can't chdir: $!");
+        $self->seterror("Can't chdir: $!");
         return undef;
     }
 
     system("$self->{uncomp} '$abs_path' | tar xf - '$file'") and do {
-        seterror("Can't extract file from tar: $!");
+        $self->seterror("Can't extract file from tar: $!");
         chdir($here);
         return undef;
@@ -65 +65 @@
         open(my $fh, '>', $abs_dest) or return undef;
         if(!copy("$tempdir/$file", $fh)) {
-            seterror("Can't copy file to destination: $!");
+            $self->seterror("Can't copy file to destination: $!");
             unlink($abs_dest);
             chdir($here);