always symlink orig.tar.gz from tarball dir

ff it's there and --tarball-dir is being used
Closes: 490706

1 files changed, 4 insertions, 4 deletions

diff --git a/git-buildpackage b/git-buildpackage
index 392827e2..fc3feba5 100755
--- a/git-buildpackage
+++ b/git-buildpackage
@@ -241,10 +241,10 @@ def main(argv):
 
             # Get/build the orig.tar.gz if necessary:
             if not du.is_native(cp):
-                # first look up if we have a tarball at tarball_dir
-                if options.tarball_dir and not du.has_orig(cp, output_dir):
-                    print "Looking for orig tarball '%s' from '%s'" % (du.orig_file(cp), tarball_dir)
-                    if not du.copy_orig(cp, tarball_dir, output_dir):
+                # look in tarball_dir first, if it's there even replace an existing orig.tar.gz
+                if options.tarball_dir:
+                    print "Looking for orig tarball '%s' at '%s'" % (du.orig_file(cp), tarball_dir)
+                    if not du.symlink_orig(cp, tarball_dir, output_dir):
                         print "Orig tarball '%s' not found at '%s'" % (du.orig_file(cp), tarball_dir)
                     else:
                         print "Orig tarball '%s' found at '%s'" % (du.orig_file(cp), tarball_dir)