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

diff --git a/dgit b/dgit
index 661670c3..3a79bb60 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*',
@@ -547,7 +546,8 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit-distro.test-dummy.git-url' => "$td/git",
 	       'dgit-distro.test-dummy.git-host' => "git",
 	       'dgit-distro.test-dummy.git-path' => "$td/git",
-	       'dgit-distro.test-dummy.archive-query' => "dummycat:$td/aq",
+	       'dgit-distro.test-dummy.archive-query' => "ftpmasterapi:",
+	       'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
 	       'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
 	       'dgit-distro.test-dummy.upload-host' => 'test-dummy',
                );
@@ -860,7 +860,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";
@@ -935,7 +935,7 @@ sub sshpsql ($$$) {
     my @rows;
     my @cmd = (access_cfg_ssh, $userhost,
 	       access_runeinfo("ssh-psql $runeinfo").
-	       " export LANG=C;".
+	       " export LC_MESSAGES=C; export LC_CTYPE=C;".
 	       " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
     printcmd(\*DEBUG,$debugprefix."|",@cmd) if $debug>0;
     open P, "-|", @cmd or die $!;