Merge lp://staging/~timo-jyrinki/compiz/migrate-profile-independent into lp://staging/compiz/0.9.8

Proposed by Timo Jyrinki
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 3353
Merged at revision: 3368
Proposed branch: lp://staging/~timo-jyrinki/compiz/migrate-profile-independent
Merge into: lp://staging/compiz/0.9.8
Diff against target: 248 lines (+103/-120)
4 files modified
postinst/convert-files/compiz-profile-Default.convert (+0/-60)
postinst/convert-files/compiz-profile-active-Default.convert (+0/-60)
postinst/convert-files/compiz-profile-independent-keys.convert (+59/-0)
postinst/migration-scripts/03_migrate_profile_independent.py (+44/-0)
To merge this branch: bzr merge lp://staging/~timo-jyrinki/compiz/migrate-profile-independent
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
jenkins (community) continuous-integration Approve
Review via email: mp+123685@code.staging.launchpad.net

Commit message

Migrate profile independent keys separately from the profile dependent keys.

Description of the change

Migrate profile independent keys separately from the profile dependent keys. This is still needed to completely tackle LP: #1046190. We'll also need a patched gconf2 to support 's' -> 'as' conversions.

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :
review: Approve (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Looking good, see my comment on IRC for changes in the packaging needed.

Other than that, just to be picky:

240 + if not client:
241 + print "WARNING: no gconf client found. No transitionning will be done"
242 + return

-> I would rather sys.exit(1) to mark it not transitionned yet.

3353. By Timo Jyrinki

return -> sys.exit(1)

Revision history for this message
jenkins (martin-mrazik+qa) wrote :
review: Approve (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Change done, packaging pushed. Approving

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches