diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-08-22 13:14:24 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-08-22 13:14:24 +0000 |
| commit | b19b34a08590f33973ffc9449accc21cdb1adbba (patch) | |
| tree | c9f1ba71ae1588e87ab4b3b430aa2e4528c47aa8 /perl-install/install_any.pm | |
| parent | ae35def9865df3f82303a8c72c41d0b966651f5a (diff) | |
| download | drakx-backup-do-not-use-b19b34a08590f33973ffc9449accc21cdb1adbba.tar drakx-backup-do-not-use-b19b34a08590f33973ffc9449accc21cdb1adbba.tar.gz drakx-backup-do-not-use-b19b34a08590f33973ffc9449accc21cdb1adbba.tar.bz2 drakx-backup-do-not-use-b19b34a08590f33973ffc9449accc21cdb1adbba.tar.xz drakx-backup-do-not-use-b19b34a08590f33973ffc9449accc21cdb1adbba.zip | |
no_comment
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 3c5c6801c..38ca70d54 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -113,7 +113,7 @@ sub errorOpeningFile($) { } sub getFile { my ($f, $method) = @_; - my $rel = install_any::relGetFile($f); + my $rel = relGetFile($f); log::l("getFile $f ($method) relGetFile $rel"); do { if ($method =~ /crypto/i) { @@ -133,10 +133,9 @@ sub getFile { my $f2 = "$postinstall_rpms/$f"; $f2 = "/tmp/rhimage/$rel" unless -e $f2; log::l("local getFile $f2"); - open GETFILE, $f2; - *GETFILE; + open GETFILE, $f2 and *GETFILE; } - } or errorOpeningFile($f); + } || errorOpeningFile($f); } sub getAndSaveFile { my ($file, $local) = @_; |