Dgit.pm: Deconfuse argument orders of is_orig_file_of_p_v etc.

[dgit.git] / dgit

diff --git a/dgit b/dgit
index ddc2d6ca06a58afb63dbc154974ef18561275822..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) = @_;
@@ -1078,7 +1084,7 @@ sub canonicalise_suite_ftpmasterapi {
        } qw(codename name);
        push @matched, $entry;
     }
-    fail "unknown suite $isuite" unless @matched;
+    fail "unknown suite $isuite, maybe -d would help" unless @matched;
     my $cn;
     eval {
        @matched==1 or die "multiple matches for suite $isuite\n";