summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-11-20 14:17:09 +0000
committerNick Mathewson <nickm@torproject.org>2008-11-20 14:17:09 +0000
commit1027193d7767d351ef2e119d3f5db307b8eb5e66 (patch)
tree59b1993c8d2ca4b6cb5a5d41a95d23c7af70df7f /lib
parentf90778cb749728dfa110b203cfbdfab8f29824df (diff)
Normalize paths to avoid bugging win32 folks with harmless (i believe) slashes.
git-svn-id: file:///home/or/svnrepo/updater/trunk@17335 55e972cd-5a19-0410-ae62-a4d7a52db4cd
Diffstat (limited to 'lib')
-rw-r--r--lib/thandy/repository.py3
-rw-r--r--lib/thandy/util.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/thandy/repository.py b/lib/thandy/repository.py
index 855e93a..a6df1bb 100644
--- a/lib/thandy/repository.py
+++ b/lib/thandy/repository.py
@@ -195,7 +195,8 @@ class PkgFile:
return self._relativePath
def getPath(self):
- return self._repository.getFilename(self._relativePath)
+ fname = self._repository.getFilename(self._relativePath)
+ return os.path.normpath(fname)
def getExpectedHash(self):
return self._needHash
diff --git a/lib/thandy/util.py b/lib/thandy/util.py
index 0c0aa9d..88d07f4 100644
--- a/lib/thandy/util.py
+++ b/lib/thandy/util.py
@@ -53,7 +53,7 @@ def userFilename(name):
base = os.path.expanduser(base)
if not os.path.exists(base):
os.makedirs(base, 0700)
- return os.path.join(base, name)
+ return os.path.normpath(os.path.join(base, name))
def ensureParentDir(name):
"""DOCDOC"""