[haizea-commit] r794 - branches/1.1/src/haizea/core

[haizea-commit at mailman.cs.uchicago.edu]

Author: borja
Date: 2010-05-18 16:40:16 -0500 (Tue, 18 May 2010)
New Revision: 794

Modified:
   branches/1.1/src/haizea/core/leases.py
   branches/1.1/src/haizea/core/manager.py
Log:
Fixed minor bugs (https://mailman.cs.uchicago.edu/pipermail/haizea/2010-May/000153.html)

Modified: branches/1.1/src/haizea/core/leases.py
===================================================================
--- branches/1.1/src/haizea/core/leases.py	2010-04-01 16:52:11 UTC (rev 793)
+++ branches/1.1/src/haizea/core/leases.py	2010-05-18 21:40:16 UTC (rev 794)
@@ -1701,7 +1701,7 @@
                     r.set_ninstances(type, len(instances))
                     for i, instance in enumerate(instances):
                         amount = int(instance.get("amount"))
-                        r.set_quantity_instance(type, i+1, amount)
+                        r.set_quantity_instance(res_type, i+1, amount)
                                      
             numnodes = int(nodeset_elem.get("numnodes"))
 

Modified: branches/1.1/src/haizea/core/manager.py
===================================================================
--- branches/1.1/src/haizea/core/manager.py	2010-04-01 16:52:11 UTC (rev 793)
+++ branches/1.1/src/haizea/core/manager.py	2010-05-18 21:40:16 UTC (rev 794)
@@ -157,7 +157,7 @@
                 site = Site.from_lwf_file(tracefile)
             elif resources.startswith("file:"):
                 sitefile = resources.split(":")
-                site = Site.from_xml_file(sitefile)
+                site = Site.from_xml_file(sitefile[1])
             else:
                 site = Site.from_resources_string(resources)