diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2012-10-25 09:25:25 +0300 |
---|---|---|
committer | Tzafrir Cohen <tzafrir@debian.org> | 2015-03-26 14:27:44 +0200 |
commit | cdd819f0cfd4de3e11bf36f33536e0b0b1a9c994 (patch) | |
tree | 49df11209a30b394ff0be1f7cfcb066728a52d17 | |
parent | f858dc4a83bd31c313edee111649bc426e8c9cf4 (diff) |
buildpackage: fix exporting of working copy when run from a subdir
Exporting sources failed when git-buildpackage was run from a
subdirectory of the git working directory because the path of the custom
index file was not handled correctly.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-rwxr-xr-x | gbp/scripts/buildpackage.py | 2 | ||||
-rw-r--r-- | gbp/scripts/common/buildpackage.py | 24 |
2 files changed, 14 insertions, 12 deletions
diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py index 6a9f33b..8fcec3b 100755 --- a/gbp/scripts/buildpackage.py +++ b/gbp/scripts/buildpackage.py @@ -632,7 +632,7 @@ def main(argv): source = None retval = 1 finally: - drop_index() + drop_index(repo) if not options.tag_only: if options.export_dir and options.purge and not retval: diff --git a/gbp/scripts/common/buildpackage.py b/gbp/scripts/common/buildpackage.py index dc47b75..5de315f 100644 --- a/gbp/scripts/common/buildpackage.py +++ b/gbp/scripts/common/buildpackage.py @@ -36,8 +36,6 @@ wc_names = {'WC': {'force': True, 'untracked': True}, 'WC.TRACKED': {'force': False, 'untracked': False}, 'WC.UNTRACKED': {'force': False, 'untracked': True}, 'WC.IGNORED': {'force': True, 'untracked': True}} -# index file name used to export working copy -wc_index = ".git/gbp_index" def sanitize_prefix(prefix): @@ -145,21 +143,25 @@ def dump_tree(repo, export_dir, treeish, with_submodules, recursive=True): return True +def wc_index(repo): + """Get path of the temporary index file used for exporting working copy""" + return os.path.join(repo.git_dir, "gbp_index") + def write_wc(repo, force=True, untracked=True): """write out the current working copy as a treeish object""" - clone_index() - repo.add_files(repo.path, force=force, untracked=untracked, index_file=wc_index) - tree = repo.write_tree(index_file=wc_index) + clone_index(repo) + repo.add_files(repo.path, force=force, untracked=untracked, index_file=wc_index(repo)) + tree = repo.write_tree(index_file=wc_index(repo)) return tree -def drop_index(): +def drop_index(repo): """drop our custom index""" - if os.path.exists(wc_index): - os.unlink(wc_index) + if os.path.exists(wc_index(repo)): + os.unlink(wc_index(repo)) -def clone_index(): +def clone_index(repo): """Copy the current index file to our custom index file""" - indexfn = ".git/index" + indexfn = os.path.join(repo.git_dir, "index") if os.path.exists(indexfn): - shutil.copy2(indexfn, wc_index) + shutil.copy2(indexfn, wc_index(repo)) |