diff options
| author | Aleksey Lim <alsroot@sugarlabs.org> | 2013-05-24 02:59:40 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@sugarlabs.org> | 2013-05-24 02:59:40 (GMT) |
| commit | 24d046b56e67c8201848831fc14d1b32202592a7 (patch) | |
| tree | cbaa1a8916f39b4bb7b00219db29e265c8e03a5e | |
| parent | a8ea295985c2c1282750c958cf2ce786dc20fa3d (diff) | |
Avoid ambiguities in presolve repo names
| -rw-r--r-- | sugar_network/node/obs.py | 2 | ||||
| -rwxr-xr-x | tests/units/node/obs.py | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sugar_network/node/obs.py b/sugar_network/node/obs.py index 5359059..321f950 100644 --- a/sugar_network/node/obs.py +++ b/sugar_network/node/obs.py @@ -88,7 +88,7 @@ def presolve(aliases, dst_path): _logger.debug('Presolve %r on %s', names, repo['name']) dst_dir = join(dst_path, 'packages', - '%s:%s' % (obs_presolve_project.value, repo['name'])) + '%s::%s' % (obs_presolve_project.value, repo['name'])) if not exists(dst_dir): os.makedirs(dst_dir) result = {} diff --git a/tests/units/node/obs.py b/tests/units/node/obs.py index 532ba4e..a46da8f 100755 --- a/tests/units/node/obs.py +++ b/tests/units/node/obs.py @@ -133,18 +133,18 @@ class ObsTest(tests.Test): {'path': 'pkg1-2.prm', 'name': 'pkg1-2'}, ], }, - json.load(file('packages/presolve:OLPC-11.3.1/pkg1'))) + json.load(file('packages/presolve::OLPC-11.3.1/pkg1'))) self.assertEqual({ 'arch': [ {'path': 'pkg2-1.prm', 'name': 'pkg2-1'}, {'path': 'pkg2-2.prm', 'name': 'pkg2-2'}, ], }, - json.load(file('packages/presolve:OLPC-11.3.1/pkg2'))) - self.assertEqual('1', file('packages/presolve:OLPC-11.3.1/pkg1-1.prm').read()) - self.assertEqual('2', file('packages/presolve:OLPC-11.3.1/pkg1-2.prm').read()) - self.assertEqual('3', file('packages/presolve:OLPC-11.3.1/pkg2-1.prm').read()) - self.assertEqual('4', file('packages/presolve:OLPC-11.3.1/pkg2-2.prm').read()) + json.load(file('packages/presolve::OLPC-11.3.1/pkg2'))) + self.assertEqual('1', file('packages/presolve::OLPC-11.3.1/pkg1-1.prm').read()) + self.assertEqual('2', file('packages/presolve::OLPC-11.3.1/pkg1-2.prm').read()) + self.assertEqual('3', file('packages/presolve::OLPC-11.3.1/pkg2-1.prm').read()) + self.assertEqual('4', file('packages/presolve::OLPC-11.3.1/pkg2-2.prm').read()) class Response(object): |