From c423be6437a88af6f795fbfdfd305241bf1f1a90 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@sugarlabs.org>
Date: Fri, 20 Sep 2013 02:18:11 +0000
Subject: Consider sweets-sugar as a basis package while presolving dependency trees

---
diff --git a/sugar-network b/sugar-network
index 8f07434..4fdf588 100755
--- a/sugar-network
+++ b/sugar-network
@@ -323,8 +323,11 @@ class Application(application.Application):
 
         def porcelain_dump(value):
             if type(value) is dict:
-                for i in sorted(value.items()):
-                    print '%-18s%s' % i
+                if len(value) == 1 and 'guid' in value:
+                    porcelain_dump(value['guid'])
+                else:
+                    for i in sorted(value.items()):
+                        print '%-18s%s' % i
             else:
                 if type(value) not in (list, tuple):
                     value = [value]
diff --git a/sugar_network/node/obs.py b/sugar_network/node/obs.py
index 18400dc..1d8a547 100644
--- a/sugar_network/node/obs.py
+++ b/sugar_network/node/obs.py
@@ -75,7 +75,7 @@ def presolve(aliases, dst_path):
                             'arch': arch,
                             'package': package,
                             'withdeps': '1',
-                            'exclude': 'sugar',
+                            'exclude': 'sweets-sugar',
                             })
                         binaries = []
                         for pkg in response.findall('binary'):
diff --git a/tests/units/node/obs.py b/tests/units/node/obs.py
index fef1b1d..bf43ed6 100755
--- a/tests/units/node/obs.py
+++ b/tests/units/node/obs.py
@@ -93,7 +93,7 @@ class ObsTest(tests.Test):
                     'arch': 'i586',
                     'package': 'pkg1',
                     'withdeps': '1',
-                    'exclude': 'sugar',
+                    'exclude': 'sweets-sugar',
                     }},
                 [   '<resolve>',
                     '   <binary name="pkg1-1" url="http://pkg1-1.prm" arch="arch"/>',
@@ -108,7 +108,7 @@ class ObsTest(tests.Test):
                     'arch': 'i586',
                     'package': 'pkg2',
                     'withdeps': '1',
-                    'exclude': 'sugar',
+                    'exclude': 'sweets-sugar',
                     }},
                 [   '<resolve>',
                     '   <binary name="pkg2-1" url="http://pkg2-1.prm" arch="arch"/>',
--
cgit v0.9.1