summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2007-01-16 20:01:13 +0100
committerGuido Guenther <agx@bogon.sigxcpu.org>2007-01-16 20:01:13 +0100
commit27abbc3fd1981735163744bd36e67b90fb180ff1 (patch)
tree3d452c5b829e1d751cd4401bfdaafaea37a13ba3
parent263daf880fbc8f55c906560037ea122e00e264f9 (diff)
use os.path.join
-rw-r--r--git_buildpackage/deb_utils.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/git_buildpackage/deb_utils.py b/git_buildpackage/deb_utils.py
index f2ae405f..0801c4d6 100644
--- a/git_buildpackage/deb_utils.py
+++ b/git_buildpackage/deb_utils.py
@@ -15,12 +15,12 @@ def parse_changelog(changelog):
status, output = commands.getstatusoutput('dpkg-parsechangelog -l%s' % (changelog, ))
if status:
return None
- cl=email.message_from_string(output)
- if '-' in cl['Version']:
- cl['Upstream-Version'], cl['Debian-Version'] = cl['Version'].rsplit('-',1)
+ cp=email.message_from_string(output)
+ if '-' in cp['Version']:
+ cp['Upstream-Version'], cp['Debian-Version'] = cp['Version'].rsplit('-',1)
else:
- cl['Debian-Version']=cl['Version']
- return cl
+ cp['Debian-Version']=cp['Version']
+ return cp
def orig_file(cp):
@@ -36,7 +36,7 @@ def is_native(cp):
def has_orig(cp, dir):
"Check if orig.tar.gz exists in dir"
try:
- os.stat("%s%s" % (dir,orig_file(cp)))
+ os.stat( os.path.join(dir, orig_file(cp)) )
except OSError:
return False
return True