From 828615ad07732e6a4c83295af5de2b2bba03ecf7 Mon Sep 17 00:00:00 2001 From: pjmattal Date: Sun, 23 Jan 2005 23:37:35 +0000 Subject: fixes to the parsing of file dirs --- tupkg/server/tupkgs | 4 ++-- tupkg/server/tupkgs.conf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tupkg/server/tupkgs b/tupkg/server/tupkgs index b3a967c1..77aef568 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 844505fb..dcbc6795 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 -- cgit v1.2.3-24-g4f1b