Merge branch 'slaprunner'

slapos/runner/gittools.py

@@ -40,8 +40,6 @@ def cloneRepo(data):
     code = 1
   except Exception as e:
     json = safeResult(str(e))
-    if os.path.exists(workDir):
-      shutil.rmtree(workDir)
   return jsonify(code=code, result=json)
 
 def gitStatus(project):

slapos/runner/templates/cloneRepository.html

@@ -22,9 +22,9 @@
     <div id="tab1" class="tabContents">
       <div id="repository" style="margin-left:40px;">
       <label for='name'>Project name: </label>
-      <input type="text" name="name" id="name" size='20' value="Enter the project name..." />
+      <input type="text" name="name" id="name" size='20' value="slapos" />
       <label for='repo'>&nbsp;url: &nbsp;&nbsp;</label>
-      <input type="text" name="repo" id="repo" size='25' value="Enter the url of your repository..." /><br/>
+      <input type="text" name="repo" id="repo" size='25' value="http://git.erp5.org/repos/slapos.git" /><br/>
       <label for='user'>Your name: &nbsp;&nbsp;&nbsp;</label>
       <input type="text" name="user" id="user" size='20' value="{{name}}" />
       <label for='email'>Email: </label>

slapos/runner/utils.py

@@ -19,6 +19,8 @@ from flask import jsonify
 
 import slapos.slap
 
+# Global variable
+global_software_type = 'default'
 
 # Setup default flask (werkzeug) parser
 
@@ -105,8 +107,9 @@ def requestInstance(config, software_type=None):
   """
   Request the main instance of our environment
   """
-  if not software_type:
-    software_type = None
+  if software_type:
+    global global_software_type
+    global_software_type = software_type
 
   slap = slapos.slap.slap()
   profile = getCurrentSoftwareReleaseProfile(config)
@@ -122,7 +125,7 @@ def requestInstance(config, software_type=None):
       profile,
       partition_reference=getSoftwareReleaseName(config),
       partition_parameter_kw=partition_parameter_kw,
-      software_type=software_type,
+      software_type=global_software_type,
       filter_kw=None,
       state=None,
       shared=False)