diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2012-01-12 15:24:04 +0200 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2012-01-15 19:52:01 +0100 |
commit | 2aa428256885b9d2429a83c51065a42de6d0c242 (patch) | |
tree | bd1645e85d9e60737a6a42e0f32977fd6121f40d /gbp | |
parent | 835e3cab33689550b52513db32cb3feef853bef3 (diff) |
deb: minor refactor of parameters of symlink_orig()
Diffstat (limited to 'gbp')
-rwxr-xr-x[-rw-r--r--] | gbp/deb/__init__.py | 8 | ||||
-rwxr-xr-x[-rw-r--r--] | gbp/scripts/buildpackage.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gbp/deb/__init__.py b/gbp/deb/__init__.py index dc3ba8b..1f52b17 100644..100755 --- a/gbp/deb/__init__.py +++ b/gbp/deb/__init__.py @@ -437,9 +437,9 @@ def has_orig(cp, compression, dir): return False return True -def symlink_orig(cp, compression, orig_dir, output_dir, force=False): +def symlink_orig(orig_file, orig_dir, output_dir, force=False): """ - symlink orig.tar.gz from orig_dir to output_dir + symlink orig tarball from orig_dir to output_dir @return: True if link was created or src == dst False in case of error or src doesn't exist """ @@ -449,8 +449,8 @@ def symlink_orig(cp, compression, orig_dir, output_dir, force=False): if orig_dir == output_dir: return True - src = os.path.join(orig_dir, orig_file(cp, compression)) - dst = os.path.join(output_dir, orig_file(cp, compression)) + src = os.path.join(orig_dir, orig_file) + dst = os.path.join(output_dir, orig_file) if not os.access(src, os.F_OK): return False try: diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py index 8b98e0b..1c166a8 100644..100755 --- a/gbp/scripts/buildpackage.py +++ b/gbp/scripts/buildpackage.py @@ -141,7 +141,7 @@ def prepare_upstream_tarball(repo, cp, options, tarball_dir, output_dir): # look in tarball_dir first, if found force a symlink to it if options.tarball_dir: gbp.log.debug("Looking for orig tarball '%s' at '%s'" % (orig_file, tarball_dir)) - if not du.symlink_orig(cp, options.comp_type, tarball_dir, output_dir, force=True): + if not du.symlink_orig(orig_file, tarball_dir, output_dir, force=True): gbp.log.info("Orig tarball '%s' not found at '%s'" % (orig_file, tarball_dir)) else: gbp.log.info("Orig tarball '%s' found at '%s'" % (orig_file, tarball_dir)) |