Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Thu, 04 Mar 2010 17:49:31 +0100
branchstable
changeset 4801 d3ea940e2b0c
parent 4800 686419cd2dff (current diff)
parent 4798 d5bd706e9005 (diff)
child 4803 f531742e85f4
child 4805 2d0aa2b7da02
merge
--- a/cwctl.py	Thu Mar 04 17:49:14 2010 +0100
+++ b/cwctl.py	Thu Mar 04 17:49:31 2010 +0100
@@ -204,7 +204,7 @@
             # simplify constraints
             if versions:
                 for constraint in versions:
-                    op, ver = constraint.split()
+                    op, ver = constraint
                     if oper is None:
                         oper = op
                         version = ver
@@ -238,7 +238,12 @@
             for name, constraint in use.items():
                 self.constraints.setdefault(name,set())
                 if constraint:
-                    self.constraints[name].add(constraint)
+                    try:
+                        oper, version = constraint.split()
+                        self.constraints[name].add( (oper, version) )
+                    except:
+                        self.warnings.append('cube %s depends on %s but constraint badly formatted: %s'
+                                             % (cube, name, constraint))
                 self.reverse_constraints.setdefault(name, set()).add(cube)
 
 class ListCommand(Command):
cubicweb