fix run error for python3.x porting

Change-Id: If4bce33a4a66def9685a028494c0bbbfdbc3bdaa
Signed-off-by: wangbiao <biao716.wang@samsung.com>

diff --git a/gbp_repocache/__init__.py b/gbp_repocache/__init__.py
index 735fd3bef0f4b17f68a680abe069b8552b3d9cca..234f45ef7703e8173e992668f65db06b43d40ce9 100644 (file)
--- a/gbp_repocache/__init__.py
+++ b/gbp_repocache/__init__.py
@@ -51,7 +51,7 @@ class MirrorGitRepository(GitRepository): # pylint: disable=R0904
         if ret:
             return self.rev_parse(ref)
         else:
-            return stdout.splitlines()[0]
+            return stdout.decode().splitlines()[0]
 
     def set_ref(self, ref, value):
         """Change a ref"""
@@ -173,7 +173,7 @@ class MirrorGitRepository(GitRepository): # pylint: disable=R0904
 
     def list_tags(self, obj):
         """List tags pointing at certain object"""
-        return self._git_inout('tag', ['--points-at', obj])[0].splitlines()
+        return self._git_inout('tag', ['--points-at', obj])[0].decode().splitlines()
 
     def get_tag_info(self, tag):
         """Look up data of a tag"""
@@ -188,7 +188,7 @@ class MirrorGitRepository(GitRepository): # pylint: disable=R0904
         tagger_re = re.compile(
                         r'tagger (?P<name>\S.+) <(?P<email>\S+)> (?P<date>.+)')
         num = 0
-        lines = stdout.splitlines()
+        lines = stdout.decode().splitlines()
         for num, line in enumerate(lines):
             match = tagger_re.match(line)
             if match:
@@ -229,7 +229,7 @@ class CachedRepo(object):
 
         # Safe repo dir name
         urlbase, reponame = self._split_url(url)
-        subdir = hashlib.sha1(urlbase).hexdigest() # pylint: disable=E1101
+        subdir = hashlib.sha1(urlbase.encode()).hexdigest() # pylint: disable=E1101
         self._repodir = os.path.join(self._basedir, subdir, reponame)
 
         self._init_cache_dir()

diff --git a/obs_service_gbp/command.py b/obs_service_gbp/command.py
index 335ca46f7f8091a2a3a00d04c97b4637bb24be4e..601ead614f1a9bf63d6496844b01247b5774b8fb 100644 (file)
--- a/obs_service_gbp/command.py
+++ b/obs_service_gbp/command.py
@@ -94,10 +94,10 @@ def read_config(filenames=None):
     default_configs = ['/etc/obs/services/git-buildpackage',
                        '~/.obs/git-buildpackage']
 
-    defaults = {'repo-cache-dir': '/var/cache/obs/git-buildpackage-repos/',
+    defaults = {'repo-cache-dir': '/tmp/cache/git-buildpackage-repos/',
                 'gbp-tmp-dir': '/tmp/obs-service-gbp/',
-                'gbp-user': None,
-                'gbp-group': None,
+                'gbp-user': "",
+                'gbp-group': "",
                 'repo-cache-refs-hack': 'no'}
 
     configs = default_configs if filenames is None else filenames