Merge lp:~sil2100/compiz/gsettings_migration into lp:compiz/0.9.8
| Status: | Merged |
|---|---|
| Approved by: | Daniel van Vugt on 2012-07-24 |
| Approved revision: | 3289 |
| Merged at revision: | 3287 |
| Proposed branch: | lp:~sil2100/compiz/gsettings_migration |
| Merge into: | lp:compiz/0.9.8 |
| Diff against target: |
305 lines (+289/-0) 3 files modified
postinst/convert-files/compiz-profile-Default.convert (+110/-0) postinst/convert-files/compiz-profile-active-Default.convert (+110/-0) postinst/migration-scripts/02_migrate_to_gsettings.py (+69/-0) |
| To merge this branch: | bzr merge lp:~sil2100/compiz/gsettings_migration |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel van Vugt | 2012-07-23 | Approve on 2012-07-24 | |
|
Review via email:
|
|||
Commit Message
Added .convert files (for gsettings-
Description of the Change
Adding gsettings .convert files that could be used by gsettings-
UNBLOCK
| Didier Roche (didrocks) wrote : | # |
| Łukasz Zemczak (sil2100) wrote : | # |
As already mentioned on IRC, the check for this case has been added but at the very beginning of the script - not to call gconf functions needlessly. But I am switching this to the approach mentioned by Didier.
- 3289. By Łukasz Zemczak on 2012-07-23
-
Introducing the changes as noted by Didier
| Daniel van Vugt (vanvugt) wrote : | # |
Doesn't seem to interfere with building/installing at all. So approved.


Hey Lukasz, it seems you forgot the case I discussed on Friday with you:
+ elif current_profile_str == 'Default': file('compiz- profile- active- Default. convert' ) file('compiz- profile- unity.convert' )
308 + print "Will migrate 'Default' as the active profile"
309 + migrate_
310 + migrate_
you should take into account the case where compiz is installed without unity. So something alone the long: file('compiz- profile- active- Default. convert' ) profile- unity.convert is installed:
migrate_ file('compiz- profile- unity.convert' )
else (instead of elif)
migrate_
if compiz-