Dgit.pm: Deconfuse argument orders of is_orig_file_of_p_v etc.

NFC.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 05e4c0c85178f490ad3de9c33b4d0f60cdf3107a..787e50655487ec1e672a0c06aeb642f28e17a3b9 100644 (file)
--- 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;

diff --git a/dgit b/dgit
index 29d29d14c6656db6b39308a7b3bec89f85f6ca97..283db224f2753023463decb63e43d2cb21b2c9e0 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -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) = @_;