chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: Do not introduce duplicate origs in .changes files
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index bbfaea1ec6fe326a3f8f0a6022bc06453b607c55..d18cc73b000be7b6fefafb869f900d940e5bda09 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-1975,12
+1975,12
@@
END
if ($found_same) {
# in archive, delete from .changes if it's there
$changed{$file} = "removed" if
if ($found_same) {
# in archive, delete from .changes if it's there
$changed{$file} = "removed" if
- $changes->{$fname} =~ s/
^.* \Q$file\E$(?:)\n
//m;
- } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)
\n
/m) {
+ $changes->{$fname} =~ s/
\n.* \Q$file\E$(?:)$
//m;
+ } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)
$
/m) {
# not in archive, but it's here in the .changes
} else {
my $dsc_data = getfield $dsc, $fname;
# not in archive, but it's here in the .changes
} else {
my $dsc_data = getfield $dsc, $fname;
- $dsc_data =~ m/^(.* \Q$file\E$)
\n
/m or die "$dsc_data $file ?";
+ $dsc_data =~ m/^(.* \Q$file\E$)
$
/m or die "$dsc_data $file ?";
my $extra = $1;
$extra =~ s/ \d+ /$&$placementinfo /
or die "$fname $extra >$dsc_data< ?"
my $extra = $1;
$extra =~ s/ \d+ /$&$placementinfo /
or die "$fname $extra >$dsc_data< ?"