Merge branch 'fixTmpDirs' into main

BuildBotLib/make.py

@@ -3,7 +3,6 @@
 from BuildBotLib.basemodule import BaseModule
 
 from buildbot.plugins import util, steps
-import datetime
 from BuildBotLib.secretManager import SecretManager
 import hashlib
 
@@ -26,7 +25,6 @@ class Make(BaseModule):
 
             return project
 
-
         return cmdWraper
 
     def isSupport(self, step):
@@ -56,6 +54,14 @@ class Make(BaseModule):
         project = repository[begin + 1:len(repository)]
         return project
 
+    def getLastRepoName(self, url):
+        fullName = self.getNameProjectFromGitUrl(url)
+        array = fullName.split('/')
+        if len(array) <= 0:
+            return ""
+
+        return array[-1]
+
     def destDirPrivate(self, props):
         repo = str(props.getProperty('repository'))
         buildnumber = str(props.getProperty('buildnumber'))
@@ -73,7 +79,7 @@ class Make(BaseModule):
         name = buildnumber + "_" + got_revision
 
         m = hashlib.md5()
-        repoPath = self.getNameProjectFromGitUrl(repo) + "/" + name
+        repoPath = self.getLastRepoName(repo) + "/" + name
 
         m.update(repoPath.encode('utf-8'))
 
@@ -251,7 +257,7 @@ class Make(BaseModule):
             @util.renderer
             def projectName(props):
                 repo = str(props.getProperty('repository'))
-                return self.destDirPrivate(repo)
+                return self.getLastRepoName(repo)
 
             @util.renderer
             def repoLocation(props):