diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2015-10-05 14:49:31 +0300 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2015-10-19 08:59:28 +0200 |
| commit | 32d703fa26f74d2413f6e0ae22d994ac9f8c06df (patch) | |
| tree | bf97943d07190a2a8e0f5820315075ad0082a358 /gbp/scripts/buildpackage_rpm.py | |
| parent | 3474d74e701fb6b3927dc485d671571fe73c1c92 (diff) | |
buildpackage_rpm: use wc_name from common
Use the special "treeish" name for working copy as configured in
gbp.common.buildpackage instead of hardcoding it in buildpackage_rpm.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'gbp/scripts/buildpackage_rpm.py')
| -rw-r--r-- | gbp/scripts/buildpackage_rpm.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py index d613e91..f34d6cd 100644 --- a/gbp/scripts/buildpackage_rpm.py +++ b/gbp/scripts/buildpackage_rpm.py @@ -36,7 +36,7 @@ from gbp.pkg import compressor_opts from gbp.rpm.git import GitRepositoryError, RpmGitRepository from gbp.rpm.policy import RpmPkgPolicy from gbp.tmpfile import init_tmpdir, del_tmpdir, tempfile -from gbp.scripts.common.buildpackage import (index_name, +from gbp.scripts.common.buildpackage import (index_name, wc_name, git_archive_submodules, git_archive_single, dump_tree, write_wc, drop_index) @@ -165,7 +165,7 @@ def get_tree(repo, tree_name): if tree_name == index_name: # Write a tree of the index tree = repo.write_tree() - elif tree_name == 'WC': + elif tree_name == wc_name: # Write a tree of the working copy tree = write_wc(repo) else: |