Changeset 6df4b11

Timestamp:

May 17, 2010 10:44:46 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

4b6909e

Parents:

baf19c6

Message:

Check both sides of the constraint match (!). Add lax option to output
solutions that do not match all required constraints.

File:

• fedd/compose.py (modified) (4 diffs)

fedd/compose.py

@@ -46 +46 @@
         self.add_option('--format', dest='format', default="xml",
                 help='Output file format')
+        self.add_option('--lax', dest='lax', default=False,
+                action='store_true',
+                help='allow solutions where unrequired constraints fail')
 
     @staticmethod
@@ -151 +154 @@
     for c in candidates:
         if not c.match:
-            match = None
+            rmatch = None   # Match to a required constraint
+            umatch = None   # Match to an unrequired constraint
             for a in c.accepts:
                 for can in provides.get(a,[]):
@@ -159 +163 @@
                     if can.name != c.name and can.name[2] != c.name[2] and \
                             not can.match:
-                        match = can
+                        # Now check that the candidate also accepts c
+                        for ca in can.accepts:
+                            if ca in c.provides:
+                                if can.required: rmatch = can
+                                else: umatch = can
+                                break
+                        
                         # Within providers, prefer matches against required
-                        # composition points
-                        if can.required:
+                        # composition points. 
+                        if rmatch:
                             break
                 # Within acceptance categories, prefer matches against required
                 # composition points
-                if match and match.required:
+                if rmatch:
                     break
 
-            # Done checking all possible matches.
+            # Move the better match over to the match variable
+            if rmatch: match = rmatch
+            elif umatch: match = umatch
+            else: match = None
+
+            # Done checking all possible matches.  Record the match or note an
+            # unmatched candidate.
             if match:
                 match.match = c
@@ -540 +556 @@
     if not meet_constraints([c for c in constraints if c.required], 
             provides, accepts):
-        sys.exit("Could not meet all required constraints")
+        if opts.lax:
+            warn("warning: could not meet all required constraints")
+        else:
+            sys.exit("Failed: could not meet all required constraints")
 
     meet_constraints([ c for c in constraints if not c.match ],