summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpjmattal <pjmattal>2005-01-23 23:37:35 +0000
committerpjmattal <pjmattal>2005-01-23 23:37:35 +0000
commit828615ad07732e6a4c83295af5de2b2bba03ecf7 (patch)
tree5a4daa04533409cfe15cc1ed1bf4383b198481db
parenta243a78f5a38c5bcbf0402738a6b3e2ece71218e (diff)
downloadaurweb-828615ad07732e6a4c83295af5de2b2bba03ecf7.tar.xz
fixes to the parsing of file dirs
-rwxr-xr-xtupkg/server/tupkgs4
-rw-r--r--tupkg/server/tupkgs.conf4
2 files changed, 4 insertions, 4 deletions
diff --git a/tupkg/server/tupkgs b/tupkg/server/tupkgs
index b3a967c..77aef56 100755
--- a/tupkg/server/tupkgs
+++ b/tupkg/server/tupkgs
@@ -36,7 +36,7 @@ config = ConfigParser.ConfigParser()
class ClientFile:
def __init__(self, filename, actual_size, actual_md5):
- self.pathname = confdict['incomingdir'] + filename
+ self.pathname = os.path.join(confdict['incomingdir'], filename)
self.filename = filename
self.fd = open(self.pathname, "a+b")
self.actual_size = actual_size
@@ -62,7 +62,7 @@ class ClientFile:
def finishDownload(self):
self.fd.close()
- newpathname = confdict['cachedir'] + self.filename
+ newpathname = os.path.join(confdict['cachedir'], self.filename)
os.rename(self.pathname, newpathname)
self.pathname = newpathname
self.fd = open(self.pathname, "a+b")
diff --git a/tupkg/server/tupkgs.conf b/tupkg/server/tupkgs.conf
index 844505f..dcbc679 100644
--- a/tupkg/server/tupkgs.conf
+++ b/tupkg/server/tupkgs.conf
@@ -1,7 +1,7 @@
[tupkgs]
port = 1034
-cachedir = '/var/cache/tupkgs/'
-incomingdir = '/var/cache/tupkgs/incomplete/'
+cachedir = /var/cache/tupkgs
+incomingdir = /var/cache/tupkgs/incomplete
[mysql]
username = aur