X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=70305040451becf05db4c4b67545111eb6b5219c;hp=2a5e26b0e0dcbca60b938a18e87c6fa09371316f;hb=c3e8b7bd35221eec4532af528e134164eb612d29;hpb=641eeadd77583420e7ad32d6a0414a24f4fc83bb

diff --git a/dgit b/dgit
index 2a5e26b0..70305040 100755
--- a/dgit
+++ b/dgit
@@ -441,6 +441,8 @@ sub cmd_help () {
     exit 0;
 }
 
+our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
+
 our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit.default.username' => '',
 	       'dgit.default.archive-query-default-component' => 'main',
@@ -453,7 +455,17 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit-distro.debian.sshpsql-host' => 'coccia.debian.org',
 	       'dgit-distro.debian.sshpsql-dbname' => 'service=projectb',
 	       'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
-	       'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/');
+	       'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
+	       'dgit-distro.test-dummy.ssh' => "$td/ssh",
+	       'dgit-distro.test-dummy.username' => "alice",
+	       'dgit-distro.test-dummy.git-check' => "ssh-cmd",
+	       'dgit-distro.test-dummy.git-create' => "ssh-cmd",
+	       '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.mirror' => "file://$td/mirror/",
+               );
 
 sub cfg {
     foreach my $c (@_) {
@@ -655,7 +667,7 @@ sub sshpsql ($$) {
     my ($userhost,$dbname) = ($`,$'); #';
     my @rows;
     my @cmd = (access_cfg_ssh, $userhost,
-	       shellquote qw(psql -A), $dbname, qw(-c), $sql);
+	       "export LANG=C; ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
     printcmd(\*DEBUG,$debugprefix."|",@cmd) if $debug>0;
     open P, "-|", @cmd or die $!;
     while (<P>) {
@@ -715,6 +727,45 @@ END
     return $rows[0];
 }
 
+sub canonicalise_suite_dummycat ($$) {
+    my ($proto,$data) = @_;
+    my $dpath = "$data/suite.$isuite";
+    if (!open C, "<", $dpath) {
+	$!==ENOENT or die "$dpath: $!";
+	printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
+	return $isuite;
+    }
+    $!=0; $_ = <C>;
+    chomp or die "$dpath: $!";
+    close C;
+    printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
+    return $_;
+}
+
+sub archive_query_dummycat ($$) {
+    my ($proto,$data) = @_;
+    canonicalise_suite();
+    my $dpath = "$data/package.$csuite.$package";
+    if (!open C, "<", $dpath) {
+	$!==ENOENT or die "$dpath: $!";
+	printdebug "dummycat query $csuite $package $dpath ENOENT\n";
+	return ();
+    }
+    my @rows;
+    while (<C>) {
+	next if m/^\#/;
+	next unless m/\S/;
+	die unless chomp;
+	printdebug "dummycat query $csuite $package $dpath | $_\n";
+	my @row = split /\s+/, $_;
+	@row==2 or die "$dpath: $_ ?";
+	push @rows, \@row;
+    }
+    C->error and die "$dpath: $!";
+    close C;
+    return @rows;
+}
+
 sub canonicalise_suite () {
     return if defined $csuite;
     fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
@@ -1896,12 +1947,12 @@ sub parseopts () {
 	    } elsif (m/^--since-version=([^_]+|_)$/) {
 		push @ropts, $_;
 		$changes_since_version = $1;
-	    } elsif (m/^--(\w+)=(.*)/s &&
+	    } elsif (m/^--([-0-9a-z]+)=(.*)/s &&
 		     ($om = $opts_opt_map{$1}) &&
 		     length $om->[0]) {
 		push @ropts, $_;
 		$om->[0] = $2;
-	    } elsif (m/^--(\w+):(.*)/s &&
+	    } elsif (m/^--([-0-9a-z]+):(.*)/s &&
 		     !$opts_opt_cmdonly{$1} &&
 		     ($om = $opts_opt_map{$1})) {
 		push @ropts, $_;