2309 pkg.depotd fails when -d argument is a relative pathname
authorTom Mueller <Tom.Mueller@sun.com>
Mon, 11 Aug 2008 15:49:58 -0500
changeset 468 20250d58c2ab
parent 467 8d02cb44c2bf
child 469 fb60a7969afc
2309 pkg.depotd fails when -d argument is a relative pathname
src/depot.py
src/modules/server/config.py
--- a/src/depot.py	Fri Aug 15 16:03:21 2008 -0500
+++ b/src/depot.py	Mon Aug 11 15:49:58 2008 -0500
@@ -69,6 +69,7 @@
 import getopt
 import logging
 import os
+import os.path
 import sys
 import urlparse
 
@@ -259,7 +260,7 @@
         except KeyError:
                 pass
 
-        scfg = config.SvrConfig(repo_path, AUTH_DEFAULT)
+        scfg = config.SvrConfig(os.path.abspath(repo_path), AUTH_DEFAULT)
 
         if rebuild:
                 scfg.destroy_catalog()
--- a/src/modules/server/config.py	Fri Aug 15 16:03:21 2008 -0500
+++ b/src/modules/server/config.py	Mon Aug 11 15:49:58 2008 -0500
@@ -27,6 +27,7 @@
 
 import errno
 import os
+import os.path
 import statvfs
 import shutil
 
@@ -88,6 +89,7 @@
                 return
 
         def set_repo_root(self, root):
+                assert(os.path.isabs(root))
                 self.repo_root = root
                 self.trans_root = os.path.join(self.repo_root, "trans")
                 self.file_root = os.path.join(self.repo_root, "file")