diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-08-02 15:27:28 -0300 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-08-02 15:27:28 -0300 |
| commit | 864c30905f865e9d407e5830d63cbd3c8cc5a8cf (patch) | |
| tree | 91600c0b7bc44428172d88ddb5fbc3512b32bafb /gbp/scripts/import_orig.py | |
| parent | ab649fef739cbcca6365fc966542307de045672b (diff) | |
test_import_orig: properly pick debian dir
Diffstat (limited to 'gbp/scripts/import_orig.py')
| -rw-r--r-- | gbp/scripts/import_orig.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py index d3feef5f..3580cd29 100644 --- a/gbp/scripts/import_orig.py +++ b/gbp/scripts/import_orig.py @@ -371,7 +371,8 @@ def debian_branch_merge_by_replace(repo, tag, version, options): # Get the current debian/ tree on the debian branch try: deb_sha = [x for x in repo.list_tree("%s^{tree}" % options.debian_branch) - if x[-1] == 'debian' and x[1] == 'tree'][0][2] + if x[-1] == b'debian' and x[1] == 'tree'][0][2] + gbp.log.debug("Using %s as debian/ tree" % deb_sha) tree.append(['040000', 'tree', deb_sha, 'debian']) msg += "\n\nwith Debian dir %s" % deb_sha except IndexError: |