X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=60b39e4ae66d7be7f9f4a07eb736daf36ce2336a;hb=d929eda43aa0a327d7a3b87c4441d412131e4617;hp=6ca1f33b38fdfb8408d5bf88203ddcbb94bf32af;hpb=8f52891ef4c7a803a1d8576897180a34b36a4e16;p=dgit.git

diff --git a/dgit b/dgit
index 6ca1f33b..60b39e4a 100755
--- a/dgit
+++ b/dgit
@@ -1382,7 +1382,7 @@ sub generate_commit_from_dsc () {
 	my $f = $fi->{Filename};
 	die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
 
-	link "../../../$f", $f
+	link_ltarget "../../../$f", $f
 	    or $!==&ENOENT
 	    or die "$f $!";
 
@@ -1481,7 +1481,7 @@ sub complete_file_from_dsc ($$) {
 	my $furl = $dscurl;
 	$furl =~ s{/[^/]+$}{};
 	$furl .= "/$f";
-	die "$f ?" unless $f =~ m/^${package}_/;
+	die "$f ?" unless $f =~ m/^\Q${package}\E_/;
 	die "$f ?" if $f =~ m#/#;
 	runcmd_ordryrun_local @curl,qw(-o),$tf,'--',"$furl";
 	next if !act_local();
@@ -2794,7 +2794,7 @@ END
     foreach my $f (<../../../../*>) { #/){
 	my $b=$f; $b =~ s{.*/}{};
 	next unless is_orig_file $b, srcfn $upstreamversion,'';
-	link $f, $b or die "$b $!";
+	link_ltarget $f, $b or die "$b $!";
         $dscaddfile->($b);
     }
 
@@ -3161,7 +3161,7 @@ sub parseopts () {
 	my ($what) = @_;
 	@rvalopts = ($_);
 	if (!defined $val) {
-	    badusage "$what needs a value" unless length @ARGV;
+	    badusage "$what needs a value" unless @ARGV;
 	    $val = shift @ARGV;
 	    push @rvalopts, $val;
 	}
@@ -3246,9 +3246,6 @@ sub parseopts () {
 		    push @ropts, $&;
 		    push @changesopts, $_;
 		    $_ = '';
-		} elsif (m/^-[dCk]$/) {
-		    badusage
- "option \`$_' requires an argument (and no space before the argument)";
 		} elsif (s/^-wn$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'none';