xuesong up

liquanzhou · Dec 6, 2019 · b59ad58 · b59ad58
1 parent 3245a62
commit b59ad58
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/app/main/deploy.py b/app/main/deploy.py
@@ -121,16 +121,16 @@ def __init__(self, project, tag, taskid, hostlist, operation, currentuser, reaso
         self.sreRobot       = sreRobot
         self.autotestURL    = autotestURL
         self.autolist       = autolist
-        self.hostPath       = remote_host_path
+        self.hostPath       = remote_host_path.rstrip('/') + '/'
 
         print(self.autolist)
 
 
-        self.dir_path_git    = path_git    + project
-        self.dir_path_log    = path_log    + project
-        self.dir_path_lock   = path_lock   + project
-        self.dir_path_conf   = path_conf   + project
-        self.dir_path_result = path_result + project
+        self.dir_path_git    = path_git.rstrip('/') + '/'    + project
+        self.dir_path_log    = path_log.rstrip('/') + '/'    + project
+        self.dir_path_lock   = path_lock.rstrip('/') + '/'   + project
+        self.dir_path_conf   = path_conf.rstrip('/') + '/'   + project
+        self.dir_path_result = path_result.rstrip('/') + '/' + project
 
 
         self.pklFile = '%s/deploy.%s.lock' %(self.dir_path_lock, project)

diff --git a/app/main/forms.py b/app/main/forms.py
@@ -49,11 +49,11 @@ def writefile(path, content):
 
 def getdir(project):
     DIR = {}
-    dir_path_git    = path_git    + project
-    dir_path_log    = path_log    + project
-    dir_path_lock   = path_lock   + project
-    dir_path_conf   = path_conf   + project
-    dir_path_result = path_result + project
+    dir_path_git    = path_git.rstrip('/') + '/'    + project
+    dir_path_log    = path_log.rstrip('/') + '/'    + project
+    dir_path_lock   = path_lock.rstrip('/') + '/'   + project
+    dir_path_conf   = path_conf.rstrip('/') + '/'   + project
+    dir_path_result = path_result.rstrip('/') + '/' + project
 
     shell_cmd = '''mkdir -p %s %s %s %s %s ''' %(dir_path_git, dir_path_log, dir_path_lock, dir_path_conf, dir_path_result)
     Result = shellcmd(shell_cmd)