summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Mancy <rmancy@redhat.com>2010-10-27 20:39:04 +1000
committerRaymond Mancy <rmancy@redhat.com>2010-10-27 20:39:04 +1000
commit317243107aafa3da90d8cdfb8c6abac20dcedbe9 (patch)
tree178539f5a974e895ef9e4cb8ee4ec88ae7ba83a1
parentfa85ea350ea20db70b5b29f102fa07b446230726 (diff)
parentc8e308c762026a40d7fb8123d106909b1e2187bf (diff)
Merge branch 'release-0.5.60' of ssh://git.fedorahosted.org/git/beaker into release-0.5.60release-0.5.60-1
-rw-r--r--LabController/proxy/src/bkr/labcontroller/proxy.py2
-rw-r--r--Server/bkr/server/templates/job_form.kid2
2 files changed, 2 insertions, 2 deletions
diff --git a/LabController/proxy/src/bkr/labcontroller/proxy.py b/LabController/proxy/src/bkr/labcontroller/proxy.py
index e1c764d..5bb8a19 100644
--- a/LabController/proxy/src/bkr/labcontroller/proxy.py
+++ b/LabController/proxy/src/bkr/labcontroller/proxy.py
@@ -391,7 +391,7 @@ class Monitor(ProxyHelper):
self.hub.recipes.change_file(mylog['tid'], server, basepath)
self.rm(mysrc)
try:
- self.removedirs(mylog['basepath'])
+ self.removedirs('%s/%s' % (mylog['basepath'], mylog['path']))
except OSError:
# Its ok if it fails, dir may not be empty yet
pass
diff --git a/Server/bkr/server/templates/job_form.kid b/Server/bkr/server/templates/job_form.kid
index 9ba0263..30b7cc9 100644
--- a/Server/bkr/server/templates/job_form.kid
+++ b/Server/bkr/server/templates/job_form.kid
@@ -1,7 +1,7 @@
<div xmlns:py="http://purl.org/kid/ns#">
<div py:if="xsd_errors">
<center>
- <div class="flash">Job failed XSD validation. Please confirm that you want to submit it.</div>
+ <div class="flash">Job failed schema validation. Please confirm that you want to submit it.</div>
<ul class="xsd-error-list">
<li py:for="error in xsd_errors">
Line ${error.line}, col ${error.column}: ${error.message}