diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-03 14:08:23 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-03 14:53:44 +0100 |
commit | dcdaf7a166dbf5599eefb8174a2445ed90560e23 (patch) | |
tree | 43db94fa2f7b08a0891315ade875884916fdb8ad | |
parent | 9b6abc0738dde6c9fd71cf33ead7262fc00c57f9 (diff) |
Dgit.pm: Deconfuse argument orders of is_orig_file_of_p_v etc.
NFC.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r-- | Debian/Dgit.pm | 2 | ||||
-rwxr-xr-x | dgit | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index 05e4c0c..787e506 100644 --- a/Debian/Dgit.pm +++ b/Debian/Dgit.pm @@ -237,7 +237,7 @@ sub source_file_leafname ($$$) { } sub is_orig_file_of_p_v ($$$) { - my ($package, $f, $upstreamvsn) = @_; + my ($f, $package, $upstreamvsn) = @_; my $base = source_file_leafname $package, $upstreamvsn, ''; return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/; return 1; @@ -198,8 +198,14 @@ sub lref () { return "refs/heads/".lbranch(); } sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); } sub rrref () { return server_ref($csuite); } -sub srcfn ($$) { return &source_file_leafname($package, @_); } -sub is_orig_file_of_vsn ($$) { return &is_orig_file_of_p_v($package, @_); } +sub srcfn ($$) { + my ($vsn, $sfx) = @_; + return &source_file_leafname($package, $vsn, $sfx); +} +sub is_orig_file_of_vsn ($$) { + my ($f, $upstreamvsn) = @_; + return is_orig_file_of_p_v($f, $package, $upstreamvsn); +} sub dscfn ($) { my ($vsn) = @_; |