- paths thing on ftpadmdir

Changed files:
    modules/cmds.py -> 1.14
    modules/common.py -> 1.11

diff --git a/modules/cmds.py b/modules/cmds.py
index 580fa444a2aaf8db03f5d0b32cbd672bb1fb1f56..76a413bad65ccb6a49c0e1abe8508e33d3abddbd 100644 (file)
--- a/modules/cmds.py
+++ b/modules/cmds.py
@@ -81,19 +81,19 @@ def load_creds():
     global users, cookies
     users={}
     cookies={}
-    if not common.fileexists(common.ftpadmdir+'var/passwd'):
+    if not common.fileexists(common.ftpadmdir+'/var/passwd'):
         return
     else:
-        f=open(common.ftpadmdir+'var/passwd', 'r')
+        f=open(common.ftpadmdir+'/var/passwd', 'r')
         for line in f.xreadlines():
             x=line.strip().split(':')
             if len(x)>=2:
                 users[x[0]]=x[1]
         f.close()
-    if not common.fileexists(common.ftpadmdir+'var/cookies'):
+    if not common.fileexists(common.ftpadmdir+'/var/cookies'):
         return
     else:
-        f=open(common.ftpadmdir+'var/cookies', 'r')
+        f=open(common.ftpadmdir+'/var/cookies', 'r')
         for line in f.xreadlines():
             x=line.strip().split(':')
             if len(x)>=2:
@@ -101,7 +101,7 @@ def load_creds():
         f.close()
 
 def write_cookies():
-    f=open(common.ftpadmdir+'var/cookies', 'w')
+    f=open(common.ftpadmdir+'/var/cookies', 'w')
     for key in cookies.keys():
         f.write('%s:%s\n' % (key, cookies[key]))
     f.close()
@@ -178,7 +178,7 @@ cmdlist_noargs={'lout':cmd_logout, 'gett':cmd_gettree, 'slck':cmd_show_locks}
 
 BailOut="BailOut"
 locks={}
-logfile=open(common.ftpadmdir+'var/log', 'a')
+logfile=open(common.ftpadmdir+'/var/log', 'a')
 load_creds()
 reloadftptree()
 salt=md5.new(`time.time()`).hexdigest()

diff --git a/modules/common.py b/modules/common.py
index 945117ec9f943338c2e5593136de03e75a38cb04..19f3aa8949e3c09076ec72d554ec46f763b6dd5d 100644 (file)
--- a/modules/common.py
+++ b/modules/common.py
@@ -15,12 +15,12 @@ def checkdir(dir):
         sys.exit(1)
 
 if 'HOME' in os.environ:
-    ftpadmdir = os.environ['HOME'] + '/pld-ftp-admin/'
+    ftpadmdir = os.environ['HOME'] + '/pld-ftp-admin'
 else:
-    ftpadmdir = '../'
+    ftpadmdir = '..'
 
 # noarchcachedir is dir where noarch files contents are stored for AI
 # XXX: file reference where the AI resides
-noarchcachedir = ftpadmdir + 'var/noarch-cache/'
+noarchcachedir = ftpadmdir + '/var/noarch-cache/'
 
-tmpdir = ftpadmdir + 'var/tmp/'
+tmpdir = ftpadmdir + '/var/tmp/'