diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-01-25 18:30:02 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-01-25 18:30:02 +0000 |
| commit | a19ba05ac042d3be97c82176a40fefe382e5192e (patch) | |
| tree | 69ff16d6c2558d58d1852deb69b9c40559ea7cb5 | |
| parent | 6873f09189fdca9ca153d450e17254f3c838305a (diff) | |
| download | drakx-a19ba05ac042d3be97c82176a40fefe382e5192e.tar drakx-a19ba05ac042d3be97c82176a40fefe382e5192e.tar.gz drakx-a19ba05ac042d3be97c82176a40fefe382e5192e.tar.bz2 drakx-a19ba05ac042d3be97c82176a40fefe382e5192e.tar.xz drakx-a19ba05ac042d3be97c82176a40fefe382e5192e.zip | |
(extract_modules) silent failure to extract gz modules (for rescue)
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/modules.pm | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index f98fcf27c..2643f2b5e 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,4 @@ +- silent failure to extract gz modules (for rescue) - diskdrake: o better default name for new VG (vg-mga, vg-mga1, ... instead of vg-0, vg-1, ...) diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 6b3e90616..c431268c6 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -309,7 +309,7 @@ sub extract_modules { my $path = list_modules::modname2path($modname); my $f = $modname . module_extension(); if (-e $path) { - system("gzip -dc $path > $dir/$f") == 0 + system("gzip -dc $path > $dir/$f 2>/dev/null") == 0 or system("xz -d < $path > $dir/$f") == 0 or unlink "$dir/$f"; } else { |