diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
| commit | 1be510f9529cb082f802408b472a77d074b394c0 (patch) | |
| tree | b175f9d5fcb107576dabc768e7bd04d4a3e491a0 /zarb-ml/mageia-dev/attachments/20121109/22cc410c | |
| parent | fa5098cf210b23ab4f419913e28af7b1b07dafb2 (diff) | |
| download | archives-master.tar archives-master.tar.gz archives-master.tar.bz2 archives-master.tar.xz archives-master.zip | |
Diffstat (limited to 'zarb-ml/mageia-dev/attachments/20121109/22cc410c')
| -rw-r--r-- | zarb-ml/mageia-dev/attachments/20121109/22cc410c/attachment-0001.bin | 26 | ||||
| -rw-r--r-- | zarb-ml/mageia-dev/attachments/20121109/22cc410c/attachment.bin | 26 |
2 files changed, 52 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/attachments/20121109/22cc410c/attachment-0001.bin b/zarb-ml/mageia-dev/attachments/20121109/22cc410c/attachment-0001.bin new file mode 100644 index 000000000..6da53fe3b --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20121109/22cc410c/attachment-0001.bin @@ -0,0 +1,26 @@ +Index: urpm.pm +=================================================================== +--- urpm.pm (révision 6367) ++++ urpm.pm (copie de travail) +@@ -165,7 +165,9 @@ + my ($urpm) = @_; + $< or return; + +- my $dir = ($urpm->{urpmi_root} || '') . userdir_prefix($urpm) . $< . "/lib"; ++ my $dir = $urpm->{options}{cachedir} ? ++ $urpm->{options}{cachedir} . "/lib": ++ ($urpm->{urpmi_root} || '') . userdir_prefix($urpm) . $< . "/lib"; + init_dir($urpm, $dir); + } + +@@ -174,7 +176,9 @@ + my ($urpm) = @_; + $< or return; + +- my $dir = ($urpm->{urpmi_root} || '') . userdir_prefix($urpm) . $<; ++ my $dir = $urpm->{options}{cachedir} ? ++ $urpm->{options}{cachedir} : ++ ($urpm->{urpmi_root} || '') . userdir_prefix($urpm) . $<; + init_dir($urpm, $dir); + } + diff --git a/zarb-ml/mageia-dev/attachments/20121109/22cc410c/attachment.bin b/zarb-ml/mageia-dev/attachments/20121109/22cc410c/attachment.bin new file mode 100644 index 000000000..6da53fe3b --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20121109/22cc410c/attachment.bin @@ -0,0 +1,26 @@ +Index: urpm.pm +=================================================================== +--- urpm.pm (révision 6367) ++++ urpm.pm (copie de travail) +@@ -165,7 +165,9 @@ + my ($urpm) = @_; + $< or return; + +- my $dir = ($urpm->{urpmi_root} || '') . userdir_prefix($urpm) . $< . "/lib"; ++ my $dir = $urpm->{options}{cachedir} ? ++ $urpm->{options}{cachedir} . "/lib": ++ ($urpm->{urpmi_root} || '') . userdir_prefix($urpm) . $< . "/lib"; + init_dir($urpm, $dir); + } + +@@ -174,7 +176,9 @@ + my ($urpm) = @_; + $< or return; + +- my $dir = ($urpm->{urpmi_root} || '') . userdir_prefix($urpm) . $<; ++ my $dir = $urpm->{options}{cachedir} ? ++ $urpm->{options}{cachedir} : ++ ($urpm->{urpmi_root} || '') . userdir_prefix($urpm) . $<; + init_dir($urpm, $dir); + } + |