Merge lp:~compiz-team/compiz/compiz.fix_1048964 into lp:compiz/0.9.8

Proposed by Sam Spilsbury
Status: Merged
Approved by: Daniel van Vugt
Approved revision: 3385
Merged at revision: 3385
Proposed branch: lp:~compiz-team/compiz/compiz.fix_1048964
Merge into: lp:compiz/0.9.8
Diff against target: 25 lines (+2/-2)
2 files modified
compizconfig/ccsm/CMakeLists.txt (+1/-1)
compizconfig/compizconfig-python/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_1048964
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
jenkins (community) continuous-integration Approve
Review via email: mp+125839@code.launchpad.net

Commit message

Fix build on python 2.6. Use the old method of detecting the version.
(LP: #1048964)

Description of the change

Fix build on python 2.6. Use the old method of detecting the version.

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
Daniel van Vugt (vanvugt) wrote :

Well, I can confirm python-2.7 still works at least.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compizconfig/ccsm/CMakeLists.txt'
2--- compizconfig/ccsm/CMakeLists.txt 2012-09-06 12:17:40 +0000
3+++ compizconfig/ccsm/CMakeLists.txt 2012-09-22 03:17:18 +0000
4@@ -12,7 +12,7 @@
5 execute_process (COMMAND uname -p OUTPUT_VARIABLE PROC_ARCH)
6
7 # Get Python Version
8-execute_process (COMMAND python -c "import sys; print str (sys.version_info.major) + '.' + str (sys.version_info.minor)"
9+execute_process (COMMAND python -c "import sys; print str (sys.version_info[0]) + '.' + str (sys.version_info[1])"
10 OUTPUT_VARIABLE PY_VERSION)
11
12 string (REPLACE "\n" "" PROC_ARCH ${PROC_ARCH})
13
14=== modified file 'compizconfig/compizconfig-python/CMakeLists.txt'
15--- compizconfig/compizconfig-python/CMakeLists.txt 2012-09-07 05:41:18 +0000
16+++ compizconfig/compizconfig-python/CMakeLists.txt 2012-09-22 03:17:18 +0000
17@@ -12,7 +12,7 @@
18 execute_process (COMMAND uname -p OUTPUT_VARIABLE PROC_ARCH)
19
20 # Get Python Version
21-execute_process (COMMAND python -c "import sys; print str (sys.version_info.major) + '.' + str (sys.version_info.minor)"
22+execute_process (COMMAND python -c "import sys; print str (sys.version_info[0]) + '.' + str (sys.version_info[1])"
23 OUTPUT_VARIABLE PY_VERSION)
24
25 string (REPLACE "\n" "" PROC_ARCH ${PROC_ARCH})

Subscribers

People subscribed via source and target branches