diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2008-08-20 08:02:20 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2008-08-20 08:02:20 +0000 |
| commit | 2a6cdfec9dcbe1f07a5c640bd1b80a268dd8f3e2 (patch) | |
| tree | 5eace0597aef9801fe5b675b2d748fd4016e9d2c | |
| parent | f0334b4d3364e139673c204a3b9c6a757d42b687 (diff) | |
| download | drakx-2a6cdfec9dcbe1f07a5c640bd1b80a268dd8f3e2.tar drakx-2a6cdfec9dcbe1f07a5c640bd1b80a268dd8f3e2.tar.gz drakx-2a6cdfec9dcbe1f07a5c640bd1b80a268dd8f3e2.tar.bz2 drakx-2a6cdfec9dcbe1f07a5c640bd1b80a268dd8f3e2.tar.xz drakx-2a6cdfec9dcbe1f07a5c640bd1b80a268dd8f3e2.zip | |
remove debugging code that wrongly went in last commit (r244224 on
2008-08-19), thus fixing using remote repositories (spotted by pixel)
| -rw-r--r-- | perl-install/install/NEWS | 3 | ||||
| -rwxr-xr-x | tools/drakx-in-chroot | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index a3f405c1e..6220db76d 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- drakx-in-chroot: + o fix using remote repositories + Version 11.18 - 19 August 2008 - center sub dialogs diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot index 6073ce236..2496c21d2 100755 --- a/tools/drakx-in-chroot +++ b/tools/drakx-in-chroot @@ -69,12 +69,7 @@ if ($remote_repository) { } sys("$sudo mount -o bind $dir $SLASH_LOCATION$prefix_ROOTED"); - -if ($repository_uri) { - $repository_uri = '/C/cooker/i586'; -} elsif (!$remote_repository) { - $repository_uri = $repository_without_arch; -} +$repository_uri ||= $repository_without_arch if !$remote_repository; sys("$sudo mount -o bind $repository_uri $SLASH_LOCATION$MEDIA_LOCATION_ROOTED") if $repository_uri; sys("$sudo mount -t proc none $SLASH_LOCATION/proc"); |