There are a few more instances where anything before the @ needs to be removed
the the directory structure:
r...@bishop:/usr/bin# diff -u apt-mirror.20080923 apt-mirror.20090106
--- apt-mirror.20080923 2008-09-23 14:20:51.000000000 -0400
+++ apt-mirror.20090106 2009-01-06 16:06:48.000000000 -0500
@@ -233,7 +233,7 @@
}
if($config_line eq "skip-clean") {
- $config_line[0] =~ s[^(\w+)://][];
+ $config_line[0] =~ s[^(\w+)://(.*@)?][];
$config_line[0] =~ s[/$][];
$config_line[0] =~ s[~][%7E]g if get_variable("_tilde");
$skipclean{$config_line[0]} = 1;
@@ -241,7 +241,7 @@
}
if($config_line eq "clean") {
- $config_line[0] =~ s[^(\w+)://][];
+ $config_line[0] =~ s[^(\w+)://(.*@)?][];
$config_line[0] =~ s[/$][];
$config_line[0] =~ s[~][%7E]g if get_variable("_tilde");
$clean_directory{$config_line[0]} = 1;
@@ -319,7 +319,7 @@
download_urls("index", @index_urls);
foreach (keys %urls_to_download) {
- s[^(\w+)://][];
+ s[^(\w+)://(.*@)?][];
s[~][%7E]g if get_variable("_tilde");
$skipclean{$_} = 1;
$skipclean{$_} = 1 if s[\.gz$][];
@@ -374,7 +374,7 @@
my ($path, $package, $mirror, $files) = '';
$path = $uri;
- $path =~ s[^(\w+)://][];
+ $path =~ s[^(\w+)://(.*@)?][];
$path =~ s[...@]+@][];
$path =~ s/~/\%7E/g if get_variable("_tilde");
local $/ = "\n\n";
@@ -493,9 +493,8 @@
}
foreach (@index_urls) {
- die("apt-mirror: invalid url in index_urls") unless s[^(\w+)://][];
+ die("apt-mirror: invalid url in index_urls") unless s[^(\w+)://(.*@)?][];
copy_file(get_variable("skel_path") . "/$_", get_variable("mirror_path") .
"/$_");
- copy_file(get_variable("skel_path") . "/$_", get_variable("mirror_path") .
"/$_") if(s/\.gz$//);
}
--
apt-mirror does not correctly handle apache auth protected apt repositories
https://bugs.launchpad.net/bugs/250614
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
