diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-08-29 12:36:26 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-08-29 12:36:26 +0000 |
| commit | 82dd39da15b27dde8f823380f8571e0a3cd63eee (patch) | |
| tree | cd75e8b4d7dab6168a26f13bf27a7434247ca891 /perl-install/install_any.pm | |
| parent | b20d62cf6f8493cc79c9e8b25e39d2bb5bbd735b (diff) | |
| download | drakx-82dd39da15b27dde8f823380f8571e0a3cd63eee.tar drakx-82dd39da15b27dde8f823380f8571e0a3cd63eee.tar.gz drakx-82dd39da15b27dde8f823380f8571e0a3cd63eee.tar.bz2 drakx-82dd39da15b27dde8f823380f8571e0a3cd63eee.tar.xz drakx-82dd39da15b27dde8f823380f8571e0a3cd63eee.zip | |
*** empty log message ***
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 11d57f120..45864b015 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -61,7 +61,7 @@ sub relGetFile($) { local $_ = $_[0]; m,^(Mandrake|lnx4win)/, and return $_; /\.img$/ and return "images/$_"; - my $dir = m|/| ? "Mandrake/mdkinst" : /^(?:compss|compssList|compssUsers|filelist|depslist.*|hdlist.*|auto_inst.*)$/ ? + my $dir = m|/| ? "Mandrake/mdkinst" : /^(?:compss|compssList|compssUsers|provides|filelist|depslist.*|hdlist.*|auto_inst.*)$/ ? "Mandrake/base/": "$::o->{packages}[2]{$asked_medium}{rpmsdir}/"; "$dir$_"; } @@ -422,9 +422,9 @@ sub install_urpmi { http => $ENV{URLPREFIX}, cdrom => "removable_cdrom_$::i://mnt/cdrom" }}{$method} . "/$_->{rpmsdir}"; - local *FILES; open FILES, "bzip2 -dc /tmp/$_->{hdlist} 2>/dev/null | hdlist2names - |"; + local *FILES; open FILES, "packdrake -c /tmp/$_->{hdlist} | parsehdlist - |"; chop, print LIST "$dir/$_\n" foreach <FILES>; - close FILES or log::l("hdlist2names failed"), return; + close FILES or log::l("parsehdlist failed"), return; close LIST; $dir .= " with ../base/$_->{hdlist}" if $method =~ /ftp|http/; |