[gnome-ostree] Don't expanduser None



commit c673b25493c435e37503043ea954e5eccff6f986
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Aug 23 21:56:22 2012 -0400

    Don't expanduser None
    
    This breaks if the repo key is not set in ostbuild.cfg, like on
    my system.

 src/ostbuild/pyostbuild/builtins.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/ostbuild/pyostbuild/builtins.py b/src/ostbuild/pyostbuild/builtins.py
index 8ebdec3..33bb062 100755
--- a/src/ostbuild/pyostbuild/builtins.py
+++ b/src/ostbuild/pyostbuild/builtins.py
@@ -168,9 +168,9 @@ class Builtin(object):
     def init_repo(self):
         if self.repo is not None:
             return self.repo
-        repo = os.path.expanduser(ostbuildrc.get_key('repo', default=None))
+        repo = ostbuildrc.get_key('repo', default=None)
         if repo is not None:
-            self.repo = repo
+            self.repo = os.path.expanduser(repo)
         else:
             shadow_path = os.path.join(self.workdir, 'shadow-repo')
             if os.path.isdir(shadow_path):



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]