aboutsummaryrefslogtreecommitdiffhomepage
path: root/gbp/deb/git.py
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2017-08-02 01:32:37 -0300
committerGuido Günther <agx@sigxcpu.org>2017-08-02 10:35:05 -0300
commit32e53bf1b11c94dea35622a2f28da7ae996ba8b7 (patch)
tree85e2b8e007f13b700f5d88d4bd1e33c5bc844850 /gbp/deb/git.py
parent819219ff88c0b74c2b7904f4afc2af6906dbf43e (diff)
deb.git: accept strings and bytes as path
so the upper layers don't need to care
Diffstat (limited to 'gbp/deb/git.py')
-rw-r--r--gbp/deb/git.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/gbp/deb/git.py b/gbp/deb/git.py
index edc83680..1c5884d7 100644
--- a/gbp/deb/git.py
+++ b/gbp/deb/git.py
@@ -21,6 +21,7 @@ from gbp.command_wrappers import CommandExecFailed
from gbp.git import GitRepository, GitRepositoryError
from gbp.deb.pristinetar import DebianPristineTar
from gbp.format import format_str
+from gbp.paths import to_bin
import gbp.log
@@ -44,6 +45,7 @@ class DebianGitRepository(GitRepository):
"""
objs = self.list_tree(tree)
new_tree_objs = []
+ dirs = [to_bin(d) for d in dirs]
for m, t, s, n in objs:
if not (n in dirs and t == 'tree'):
@@ -55,6 +57,7 @@ class DebianGitRepository(GitRepository):
"""
Get the SHA1 of directory in a given tree
"""
+ dir = to_bin(dir)
toplevel = self.list_tree(tree)
for m, t, s, n in toplevel:
if n == dir and t == 'tree':