Bump version to 0.9.3next

[snf-image] / snf-image-helper / decode-properties.py

diff --git a/snf-image-helper/decode-properties.py b/snf-image-helper/decode-properties.py
index 28af730..c9bdfde 100755 (executable)
--- a/snf-image-helper/decode-properties.py
+++ b/snf-image-helper/decode-properties.py
@@ -1,5 +1,22 @@
 #!/usr/bin/env python
 
+# Copyright (C) 2011 GRNET S.A.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
 """Decode a json encoded string with properties
 
 This program decodes a json encoded properties string and outputs it in a
@@ -15,24 +32,25 @@ import json
 from StringIO import StringIO
 from optparse import OptionParser
 
+
 def parse_arguments(input_args):
     usage = "Usage: %prog [options] <output_file>"
     parser = OptionParser(usage=usage)
     parser.add_option("-i", "--input",
-                        action="store",type='string', dest="input_file",
-                        help="get input from FILE instead of stdin",
-                        metavar="FILE")
+                      action="store", type='string', dest="input_file",
+                      help="get input from FILE instead of stdin",
+                      metavar="FILE")
 
     opts, args = parser.parse_args(input_args)
 
     if len(args) != 1:
         parser.error('output file is missing')
     output_file = args[0]
-   
+
     if opts.input_file is not None:
         if not os.path.isfile(opts.input_file):
             parser.error('input file does not exist')
- 
+
     return (opts.input_file, output_file)
 
 
@@ -44,10 +62,10 @@ def main():
 
     properties = json.load(infh)
     for key, value in properties.items():
-        os.environ['SNF_IMAGE_PROPERTY_' + key] = value
+        os.environ['SNF_IMAGE_PROPERTY_' + str(key).upper()] = value
 
     p = subprocess.Popen(['bash', '-c', 'set'], stdout=subprocess.PIPE)
-    output = StringIO(p.communicate()[0]);
+    output = StringIO(p.communicate()[0])
     for line in iter(output):
         if line.startswith('SNF_IMAGE_PROPERTY_'):
             outfh.write('export ' + line)