X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=be9045048bc6ff282755ea68fe105e14e9232d94;hp=661670c373b787ab9891f937f88ba45423547340;hb=75227f50be6aae4386166de507af1d7fcfcd4823;hpb=a67d724c1ef3fef7c591a1cf7447cc2c512488ed

diff --git a/dgit b/dgit
index 661670c3..be904504 100755
--- a/dgit
+++ b/dgit
@@ -518,7 +518,7 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit.default.ssh' => 'ssh',
 	       'dgit.default.archive-query' => 'madison:',
 	       'dgit.default.sshpsql-dbname' => 'service=projectb',
-	       'dgit-distro.debian.archive-query' => 'sshpsql:',
+	       'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
 	       'dgit-distro.debian.git-host' => 'dgit-git.debian.net',
 	       'dgit-distro.debian.git-user-force' => 'dgit',
 	       'dgit-distro.debian.git-proto' => 'git+ssh://',
@@ -533,7 +533,6 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit-distro.debian/alioth.git-proto' => 'git+ssh://',
 	       'dgit-distro.debian/alioth.git-path' => '/git/dgit-repos/repos',
 	       'dgit-distro.debian/alioth.git-create' => 'ssh-cmd',
-	       'dgit-distro.debian.sshpsql-host' => 'mirror.ftp-master.debian.org',
 	       'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
 	       'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
  'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
@@ -860,7 +859,7 @@ sub archive_query_ftpmasterapi () {
 	    my $component = "$entry->{component}";
 	    $component =~ m/^$component_re$/ or die "bad component";
 	    my $filename = "$entry->{filename}";
-	    $filename && $filename !~ m#[^-+:._0-9a-zA-Z/]|^[/.]|/[/.]#
+	    $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
 		or die "bad filename";
 	    my $sha256sum = "$entry->{sha256sum}";
 	    $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";