ACK to both
On Thu, 2010-10-28 at 13:27 -0400, Jason Guiditta wrote:
---
agent/lib/ActiveBuild.rb | 3 ++-
sample_xml/jeos_jboss.xml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/agent/lib/ActiveBuild.rb b/agent/lib/ActiveBuild.rb
index e1bc226..17138cd 100644
--- a/agent/lib/ActiveBuild.rb
+++ b/agent/lib/ActiveBuild.rb
@@ -132,6 +132,7 @@ module Com
mock_id =
File.new("#{FACTORY_CONF["mock_dir"]}/#{build_uuid}.yml","w")
mock_id.write(":description: #{build_yaml["summary"]}
+:name: #{build_yaml["name"]}
:owner_id: fedoraproject
:architecture: x86_64
")
@@ -563,7 +564,7 @@ key_file: /root/.boxgrinder/key.pem
yaml_desc["repos"] = repo_array
- name = xml_doc.xpath("//image/name")[0].content
+ name = xml_doc.xpath("//image/name")[0].content.gsub(/\s+/,
"_")
#Append UUID to make unique
yaml_desc["name"] = "#{name}-#{@image_uuid}"
diff --git a/sample_xml/jeos_jboss.xml b/sample_xml/jeos_jboss.xml
index f673788..7c8689e 100644
--- a/sample_xml/jeos_jboss.xml
+++ b/sample_xml/jeos_jboss.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<image>
- <name>f13jboss</name>
+ <name>f13 jboss</name>
<os name="fedora" version="13"/>
<description>Fedora 13 with JBoss packages</description>
<repos>