diff options
| author | Francois Pons <fpons@mandriva.com> | 2003-08-13 16:23:29 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2003-08-13 16:23:29 +0000 |
| commit | b9484b4f1956b8bb891dd08d75b775f3cb0846f8 (patch) | |
| tree | b2f336afbb03f0a395a86d0f8c624c2334e74910 | |
| parent | 8d38bc1dd7b9fe0e3db5f39cbda41ab8fb0b1a91 (diff) | |
| download | drakx-backup-do-not-use-b9484b4f1956b8bb891dd08d75b775f3cb0846f8.tar drakx-backup-do-not-use-b9484b4f1956b8bb891dd08d75b775f3cb0846f8.tar.gz drakx-backup-do-not-use-b9484b4f1956b8bb891dd08d75b775f3cb0846f8.tar.bz2 drakx-backup-do-not-use-b9484b4f1956b8bb891dd08d75b775f3cb0846f8.tar.xz drakx-backup-do-not-use-b9484b4f1956b8bb891dd08d75b775f3cb0846f8.zip | |
fixed with_hdlist possibly incorrect.
| -rw-r--r-- | perl-install/install_any.pm | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index e5e7eba07..630b19945 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -544,10 +544,21 @@ sub install_urpmi { my ($qname, $qdir) = ($name, $dir); $qname =~ s/(\s)/\\$1/g; $qdir =~ s/(\s)/\\$1/g; + #- compute correctly reference to Mandrake/base + my $with; + if ($_->{update}) { + #- an update medium always use "../base/hdlist.cz"; + $with = "../base/hdlist.cz"; + } else { + $with = $_->{rpmsdir}; + $with =~ s|/+|/|g; $with =~ s|/$||; $with =~ s|[^/]||g; $with =~ s|/|../|g; + $with .= "Mandrake/base/$_->{hdlist}"; + } + #- output new urpmi.cfg format here. push @cfg, "$qname " . ($need_list ? "" : $qdir) . " { hdlist: hdlist.$name.cz - with_hdlist: ../base/" . ($_->{update} ? "hdlist.cz" : $_->{hdlist}) . ($need_list ? " + with_hdlist: $with" . ($need_list ? " list: list.$name" : "") . ($dir =~ /removable:/ && " removable: /dev/cdrom") . " update" . " |