diff options
| author | Aleksey Lim <alsroot@sugarlabs.org> | 2012-10-05 10:19:08 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@sugarlabs.org> | 2012-10-05 10:19:08 (GMT) |
| commit | 37430cd6e8d348ca00e70f776c2c6321a43dd46a (patch) | |
| tree | 64b7d7882c43e42e6df11a5765d57b411eec7e19 | |
| parent | 61fb626170831140b6305b9da4a50ccd91c6b715 (diff) | |
Fix building package
| -rw-r--r-- | sugar_network/node/commands.py | 2 | ||||
| -rw-r--r-- | sugar_network/resources/volume.py | 4 | ||||
| -rw-r--r-- | sweets.recipe | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/sugar_network/node/commands.py b/sugar_network/node/commands.py index 75478d1..47d4c82 100644 --- a/sugar_network/node/commands.py +++ b/sugar_network/node/commands.py @@ -215,7 +215,7 @@ class MasterCommands(NodeCommands, SyncCommands): roles = [] if auth.try_validate(request, 'root'): roles.append('root') - return {'roles': roles, 'user': request.principal} + return {'roles': roles, 'guid': request.principal} def _load_pubkey(pubkey): diff --git a/sugar_network/resources/volume.py b/sugar_network/resources/volume.py index a32413f..98fb2a0 100644 --- a/sugar_network/resources/volume.py +++ b/sugar_network/resources/volume.py @@ -272,7 +272,7 @@ class VolumeCommands(ad.VolumeCommands): @ad.document_command(method='GET', cmd='deplist', mime_type='application/json') - def deplist(self, document, guid, repo, layer): + def deplist(self, document, guid, repo): """List of native packages context is dependening on. Command return only GNU/Linux package names and ignores @@ -281,8 +281,6 @@ class VolumeCommands(ad.VolumeCommands): :param repo: OBS repository name to get package names for, e.g., Fedora-14 - :param layer: - restrict dependencies only to the specified Sugar Network layer :returns: list of package names diff --git a/sweets.recipe b/sweets.recipe index c269713..0df3fad 100644 --- a/sweets.recipe +++ b/sweets.recipe @@ -23,5 +23,4 @@ install = install -m 0755 -d %(DESTDIR)s/%(PYTHONSITEDIR)s && install -m 0755 -D sugar-network-server %(DESTDIR)s/%(BINDIR)s/sugar-network-server && install -m 0755 -D misc/offline-sync %(DESTDIR)s/%(BINDIR)s/sugar-network-sync && install -m 0755 -D misc/aslo-sync %(DESTDIR)s/%(DATADIR)s/%(name)s/aslo-sync && - cp -r examples %(DESTDIR)s/%(DATADIR)s/%(name)s/ && true |