diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-01-05 05:34:40 -0500 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-01-09 00:29:50 +0100 |
| commit | 7d7f5fa30001a8ac5a1add8edc0cf23f08ecad92 (patch) | |
| tree | b310607a9f3ff5a49661fa6f8a229e9fd75bf95f | |
| parent | dfa142c77b797954ef5e83e4b7b3705f3d913233 (diff) | |
| download | drakx-7d7f5fa30001a8ac5a1add8edc0cf23f08ecad92.tar drakx-7d7f5fa30001a8ac5a1add8edc0cf23f08ecad92.tar.gz drakx-7d7f5fa30001a8ac5a1add8edc0cf23f08ecad92.tar.bz2 drakx-7d7f5fa30001a8ac5a1add8edc0cf23f08ecad92.tar.xz drakx-7d7f5fa30001a8ac5a1add8edc0cf23f08ecad92.zip | |
(rel_rpm_file) kill it
should have beend done right after
commit 12d352708ab3877a8fc027cefa1c284cf511d6d7
(thus fixing a warning with perl-5.22)
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/media.pm | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 297c4b588..6e8272edd 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- silent a perl-5.22 warning + Version 17.12 - 2 January 2016 - bootloader: diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm index b7c8535b1..17d941b1d 100644 --- a/perl-install/install/media.pm +++ b/perl-install/install/media.pm @@ -79,16 +79,6 @@ sub path { ($phys_m->{real_mntpoint} || fs::get::mntpoint_prefixed($phys_m)) . $phys_m->{rel_path} . '/' . $f; } -sub rel_rpm_file { - my ($medium, $f) = @_; - if (my ($arch) = $f =~ m|\.([^\.]*)\.rpm$|) { - $f = "$medium->{rpmsdir}/$f"; - $f =~ s/%{ARCH}/$arch/g; - $f =~ s,^/+,,g; - } - $f; -} - sub umount_phys_medium { my ($phys_m) = @_; |