# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1269447722 0
# Node ID d88657a8323bb9691243450174877881c2a2f4f1
# Parent  1eec8c29548aa8039279c220ae6e43513bee2190# Parent  a403724f631c0a6ace3811d85f7879a987514653
catchup merge

diff -r a403724f631c -r d88657a8323b dbrtools/dbr/dbrenv.py
--- a/dbrtools/dbr/dbrenv.py	Wed Mar 24 15:37:22 2010 +0000
+++ b/dbrtools/dbr/dbrenv.py	Wed Mar 24 16:22:02 2010 +0000
@@ -188,7 +188,7 @@
     #load up patches...        
     if(len(self.db) > 0):
       self.baseline = self.db      
-      self.patches = dbrpatch.loadpatches(os.path.join(self.location,dbrutils.patchpath()))
+      self.patches = dbrpatch.loadpatches(os.path.join(self.location,dbrutils.patch_path_internal()))
       self.db = dbrpatch.createpatchedbaseline(self.baseline,self.patches)
 
   def save(self):
diff -r a403724f631c -r d88657a8323b dbrtools/dbr/dbrpatch.py
--- a/dbrtools/dbr/dbrpatch.py	Wed Mar 24 15:37:22 2010 +0000
+++ b/dbrtools/dbr/dbrpatch.py	Wed Mar 24 16:22:02 2010 +0000
@@ -222,15 +222,14 @@
     return db
 
 def listpatches():
-    path = dbrutils.patchpath()
-    patchfiles = glob.glob('%spatch*.txt' % path)
+    patchfiles = glob.glob(os.path.join(dbrutils.patchpath(),'patch*.txt'))
     print 'Installed patches'
     for file in patchfiles:
       print '\t%s' % re.sub('.txt','',os.path.basename(file))
 
 def removepatch(patch):
     path = dbrutils.patchpath()
-    file = '%s%s%s' %(path,patch,'.txt')
+    file = os.path.join(path,'%s.txt' % patch)
     files = set()
     files.add(file)
     dbrutils.deletefiles(files)
@@ -238,7 +237,7 @@
 
 def loadpatches(path):
     patches = dict()
-    patchfiles = glob.glob('%spatch*.txt' % path)
+    patchfiles = glob.glob(os.path.join(path,'patch*.txt'))
 
     for file in patchfiles:
         print 'Loading patch: %s' % re.sub('.txt','',os.path.basename(file))