fix a couple of issues caused by previous commits

SolidCharity · Dec 30, 2016 · 8bb38ea · 8bb38ea
1 parent 38fe20b
commit 8bb38ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/Build.py b/lib/Build.py
@@ -102,7 +102,7 @@ def buildpackageOnCopr(self, username, projectname, packagename, branchname, pac
     if not self.container.buildProject(self.config['lbs']['DownloadUrl'] + "/repos/" + myPath + "/" + lxcdistro + "/" + lxcrelease + "/src/" + srcrpmfilename):
       raise Exception("problem building the package on copr")
 
-  def buildpackageOnContainer(self, username, projectname, packagename, branchname, lxcdistro, lxcrelease):
+  def buildpackageOnContainer(self, username, projectname, packagename, branchname, lxcdistro, lxcrelease, pathSrc):
         # install a mount for the project repo
         myPath = username + "/" + projectname
         if 'Secret' in self.config['lbs']['Users'][username]:
@@ -184,7 +184,7 @@ def buildpackage(self, username, projectname, packagename, branchname, lxcdistro
         if type(self.container) is CoprContainer:
           self.buildpackageOnCopr(username, projectname, packagename, branchname, packageSrcPath, lxcdistro, lxcrelease, lxcarch)
         else:
-          self.buildpackageOnContainer(username, projectname, packagename, branchname, lxcdistro, lxcrelease)
+          self.buildpackageOnContainer(username, projectname, packagename, branchname, lxcdistro, lxcrelease, pathSrc)
         self.logger.print("Success!")
         self.LBS.MarkPackageAsBuilt(username, projectname, packagename, branchname, lxcdistro, lxcrelease, lxcarch)
         jobFailed = False

diff --git a/lib/LightBuildServer.py b/lib/LightBuildServer.py
@@ -72,7 +72,7 @@ def __init__(self):
         cid = self.config['lbs']['Machines'][buildmachine]['cid']
       local = None
       if 'local' in self.config['lbs']['Machines'][buildmachine]:
-        local = self.config['lbs']['Machines'][buildmachine]['local']
+        local = ('t' if (self.config['lbs']['Machines'][buildmachine]['local'] == True) else 'f')
       if type == "copr" and 'maxinstances' in conf:
         for c in range(0, conf['maxinstances']):
           # copr machines are always static