From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Thu, 22 Dec 2011 01:08:03 +0000 (-0500)
Subject: fix format string in epochparse()
X-Git-Tag: sfa-2.0-7~13^2~12
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=2cef0072be65d298476b21fd4d1e90c82590423e

fix format string in epochparse()
---

diff --git a/sfa/plc/plaggregate.py b/sfa/plc/plaggregate.py
index 5c0606ce..7e51c400 100644
--- a/sfa/plc/plaggregate.py
+++ b/sfa/plc/plaggregate.py
@@ -187,8 +187,8 @@ class PlAggregate:
             if not slice:     
                 rspec_node['boot_state'] = node['boot_state']
             rspec_node['exclusive'] = 'false'
-            rspec_node['hardware_types']= [HardwareType({'name': 'plab-pc'}),
-                                           HardwareType({'name': 'pc'})]
+            rspec_node['hardware_types'] = [HardwareType({'name': 'plab-pc'}),
+                                            HardwareType({'name': 'pc'})]
             # only doing this because protogeni rspec needs
             # to advertise available initscripts 
             rspec_node['pl_initscripts'] = pl_initscripts.values()
diff --git a/sfa/util/sfatime.py b/sfa/util/sfatime.py
index c5c6a557..a1a4bf06 100644
--- a/sfa/util/sfatime.py
+++ b/sfa/util/sfatime.py
@@ -26,4 +26,4 @@ For safety this can also handle inputs that are either timestamps, or datetimes
         logger.error("Unexpected type in utcparse [%s]"%type(input))
 
 def epochparse(input):
-    return time.strftime("%Y-%d-%m-T%H:%M:%SZ", time.localtime(input)) 
+    return time.strftime("%Y-%d-%mT%H:%M:%SZ", time.localtime(input))