Merge lp://staging/~nataliabidart/software-center/winged-migration into lp://staging/software-center
Proposed by
Natalia Bidart
| Status: | Merged |
|---|---|
| Merged at revision: | 3058 |
| Proposed branch: | lp://staging/~nataliabidart/software-center/winged-migration |
| Merge into: | lp://staging/software-center |
| Diff against target: |
4677 lines (+4546/-76) 8 files modified
data/ui/sso/sso.ui (+920/-0) run-tests.sh (+5/-2) setup.py (+76/-74) software-center-sso-gtk (+33/-0) softwarecenter/sso/__init__.py (+18/-0) softwarecenter/sso/gui.py (+1168/-0) softwarecenter/sso/tests/__init__.py (+26/-0) softwarecenter/sso/tests/test_gui.py (+2300/-0) |
| To merge this branch: | bzr merge lp://staging/~nataliabidart/software-center/winged-migration |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| software-store-developers | Pending | ||
|
Review via email:
|
|||
Commit message
- Moved the code for the GTK+ SSO UI from the ubuntu-sso-client project to this project.
To post a comment you must log in.
Revision history for this message
| dobey (dobey) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
940 -#!/bin/sh
941 +#! /bin/bash
963 -#!/usr/bin/env python
964 +#! /usr/bin/env python
Why the adding of a space between ! and / here?
1127 +#!/usr/bin/env python
And not here?
Also, can you please make them be #!/usr/bin/python instead of using env? Per bug #984089, this is needed so programs can be used in virtualenv, and so that installing with python3 will work (though this code isn't ported to python3 yet obviously).
Also, as mentioned in IRC, I'm not sure the test suite actually needs trial or anything from twisted, though that may be fixed later, when porting to Python 3.