Merge lp:~chmouel/nova/lp649865 into lp:~hudson-openstack/nova/trunk

[Chmouel Boudjnah]

[Jay Pipes (jaypipes)]

termie, could you check this patch out? for some reason I thought that megaflags already dealt with this?

[Soren Hansen (soren)]

On 05-10-2010 22:07, Jay Pipes wrote:
> termie, could you check this patch out? for some reason I thought that megaflags already dealt with this?

It does. That is what is happening in the bug. It handles it by
detecting collisions. This basically makes it so that collisions are
ignored. I don't think this is the right thing to do.

If something is causing the same module to be imported twice, that's the
real bug. An important one, even.

--
Soren Hansen
Ubuntu Developer http://www.ubuntu.com/
OpenStack Developer http://www.openstack.org/

[Jay Pipes (jaypipes)]

Marking this Rejected as the bug is invalid.

Unmerged revisions

320. By Chmouel Boudjnah on 2010-10-04

Avoid having gflags.DuplicateFlagError when bulding argument list.

=== modified file 'nova/flags.py'
--- nova/flags.py	2010-09-29 00:53:27 +0000
+++ nova/flags.py	2010-10-04 12:01:57 +0000
@@ -136,6 +136,8 @@
 
 def _wrapper(func):
     def _wrapped(*args, **kw):
+        if args and args[0] in FLAGS: #already defnied
+            return
         kw.setdefault('flag_values', FLAGS)
         func(*args, **kw)
     _wrapped.func_name = func.func_name