Changeset 14307 for lang/python

Timestamp:

06/20/08 21:54:05 (5 months ago)

Author:

yoshiori

Message:

require 指定してる時に常に値が書きかわってた＞＜

Files:

• lang/python/pit/pit.py (modified) (3 diffs)

lang/python/pit/pit.py

@@ -13 +13 @@
     def set(name, opts={}):
         profile = Pit.__load()
-        ret = {}
+        result = {}
         if opts.has_key('data'):
-            ret = opts['data']
+            result = opts['data']
         else:
             if not os.environ.has_key('EDITOR'):
@@ -29 +29 @@
                 print 'No Changes'
             result = yaml.load(result)
-            profile[name] = result
-            yaml.dump(profile,
-                      open(Pit.__profile, 'w'),
-                      default_flow_style=False)
-            return result
+
+        profile[name] = result
+        yaml.dump(profile,
+                  open(Pit.__profile, 'w'),
+                  default_flow_style=False)
+        return result
 
     @staticmethod
@@ -41 +42 @@
         if opts.has_key('require'):
             for k, v in opts['require'].iteritems():
-                ret[k] = v
+                if not ret.has_key(k):
+                    ret[k] = v
             ret = Pit.set(name,{'config' : ret})
         return ret or {'username' : '', 'password' : ''}