diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-10-21 08:35:56 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2018-11-24 19:56:43 +0100 |
| commit | f9323380d8bffda9ac878be8ca50341fffc497a4 (patch) | |
| tree | a7b91a61c2652b05e7e839b6124c44991763fd3d /gbp/scripts/import_orig.py | |
| parent | 0277c5477fd86ef1871b7b6cf04bc84192a0330d (diff) | |
import-orig: rename sourcepackage to name
since it's the source package's name
Diffstat (limited to 'gbp/scripts/import_orig.py')
| -rw-r--r-- | gbp/scripts/import_orig.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py index 3d974e93..9c859f24 100644 --- a/gbp/scripts/import_orig.py +++ b/gbp/scripts/import_orig.py @@ -427,9 +427,9 @@ def main(argv): return ExitCodes.uscan_up_to_date # The main tarball - (sourcepackage, version) = detect_name_and_version(repo, upstream, options) + (name, version) = detect_name_and_version(repo, upstream, options) # Additional tarballs we expect to exist - component_tarballs = get_component_tarballs(sourcepackage, + component_tarballs = get_component_tarballs(name, version, upstream.path, options.components) @@ -441,10 +441,10 @@ def main(argv): if repo.bare: set_bare_repo_options(options) - upstream, tmpdir = unpack_tarballs(sourcepackage, upstream, version, component_tarballs, options) + upstream, tmpdir = unpack_tarballs(name, upstream, version, component_tarballs, options) (pristine_orig, linked) = prepare_pristine_tar(upstream.path, - sourcepackage, + name, version) # Don't mess up our repo with git metadata from an upstream tarball @@ -461,7 +461,7 @@ def main(argv): gbp.log.info("Importing '%s' to branch '%s'%s..." % (upstream.path, import_branch, filter_msg)) - gbp.log.info("Source package is %s" % sourcepackage) + gbp.log.info("Source package is %s" % name) gbp.log.info("Upstream version is %s" % version) msg = upstream_import_commit_msg(options, version) |