chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly quote package name when constructing regexp in complete_file_from_dsc. ...
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 6ca1f33b38fdfb8408d5bf88203ddcbb94bf32af..60b39e4ae66d7be7f9f4a07eb736daf36ce2336a 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-1382,7
+1382,7
@@
sub generate_commit_from_dsc () {
my $f = $fi->{Filename};
die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
my $f = $fi->{Filename};
die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
- link "../../../$f", $f
+ link
_ltarget
"../../../$f", $f
or $!==&ENOENT
or die "$f $!";
or $!==&ENOENT
or die "$f $!";
@@
-1481,7
+1481,7
@@
sub complete_file_from_dsc ($$) {
my $furl = $dscurl;
$furl =~ s{/[^/]+$}{};
$furl .= "/$f";
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();
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,'';
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);
}
$dscaddfile->($b);
}
@@
-3161,7
+3161,7
@@
sub parseopts () {
my ($what) = @_;
@rvalopts = ($_);
if (!defined $val) {
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;
}
$val = shift @ARGV;
push @rvalopts, $val;
}
@@
-3246,9
+3246,6
@@
sub parseopts () {
push @ropts, $&;
push @changesopts, $_;
$_ = '';
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';
} elsif (s/^-wn$//s) {
push @ropts, $&;
$cleanmode = 'none';