Add support for Breaks to b2.

Signed-off-by: Jurij Smakov <jurij@droopy.oc.cox.net>
15 years ago · bb1d1a6f0a
parent f61e151946
commit bb1d1a6f0a
1 changed files with 8 additions and 1 deletions
--- a/britney.py
+++ b/britney.py
@ -449,6 +449,13 @@ class Britney:
        while Packages.Step():
            pkg = get_field('Package')
            version = get_field('Version')
+            final_conflicts_list = []
+            conflicts = get_field('Conflicts')
+            if conflicts:
+                final_conflicts_list.append(conflicts)
+            breaks = get_field('Breaks')
+            if breaks:
+                final_conflicts_list.append(breaks)
            dpkg = [version,
                    get_field('Section'),
                    pkg, 
@ -456,7 +463,7 @@ class Britney:
                    get_field('Architecture'),
                    get_field('Pre-Depends'),
                    get_field('Depends'),
-                    get_field('Conflicts'),
+                    ', '.join(final_conflicts_list) or None,
                    get_field('Provides'),
                    [],
                    [],