diff options
author | Guido Günther <agx@sigxcpu.org> | 2017-04-12 10:56:44 +0200 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2017-04-12 11:19:09 +0200 |
commit | 09a7c84c4893eab98d3ecabf26b9968a9f82546b (patch) | |
tree | cb4461f91224ad4645a15d8d424a02e758d4de05 | |
parent | e890ce326ee66e0339ae4c83644473173fc4758e (diff) |
import_orig: move postimport_hook to separate function
Gbp-Dch: Ignore
-rw-r--r-- | gbp/scripts/import_orig.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py index 2ff342e5..f510901b 100644 --- a/gbp/scripts/import_orig.py +++ b/gbp/scripts/import_orig.py @@ -320,6 +320,9 @@ def debian_branch_merge(repo, tag, version, options): except KeyError: raise GbpError("%s is not a valid merge mode" % options.merge_mode) func(repo, tag, version, options) + + +def postimport_hook(repo, tag, version, options): if options.postimport: epoch = '' if os.access('debian/changelog', os.R_OK): @@ -352,8 +355,10 @@ def is_30_quilt(repo, options): def debian_branch_merge_by_auto(repo, tag, version, options): if is_30_quilt(repo, options): + gbp.log.debug("3.0 (quilt) package, replacing debian/ dir") return debian_branch_merge_by_replace(repo, tag, version, options) else: + gbp.log.debug("not 3.0 (quilt) package, using git merge") return debian_branch_merge_by_merge(repo, tag, version, options) @@ -628,6 +633,7 @@ def main(argv): elif options.merge: repo.rrr_branch(options.debian_branch) debian_branch_merge(repo, tag, version, options) + postimport_hook(repo, tag, version, options) # Update working copy and index if we've possibly updated the # checked out branch |