Compiz

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

  1. compiz.fix_user_env_install
  2. Merge into 0.9.8
Proposed by Sam Spilsbury
Status: Merged
Approved by: Daniel van Vugt
Approved revision: 3285
Merged at revision: 3285
Proposed branch: lp:~compiz-team/compiz/compiz.fix_user_env_install
Merge into: lp:compiz/0.9.8
Diff against target: 33 lines (+10/-2)
2 files modified
cmake/copy_file_install_user_env.cmake (+5/-1)
cmake/recompile_gsettings_schemas_in_dir_user_env.cmake (+5/-1)
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_user_env_install
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration Approve
Daniel van Vugt Approve
Review via email: mp+114575@code.launchpad.net

Commit message

Fixes CMake error when USER environment variable is not set
(LP: #1023772)

Description of the change

Fixes

CMake Error at /home/timo/compiz/build-area/compiz-0.9.8+bzr3284/cmake/copy_file_install_user_env.cmake:7 (if):
  if given arguments:

    "STREQUAL" "root"

  Unknown arguments specified

If USER environment variable is not set

UNBLOCK

To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Tested, verified. Bug 1023772 is fixed.

review: Approve
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

PASSED: Continuous integration, rev:3285
http://jenkins.qa.ubuntu.com/job/compiz-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./distribution=quantal,flavor=amd64/8/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./distribution=quantal,flavor=i386/8/console

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/copy_file_install_user_env.cmake'
2--- cmake/copy_file_install_user_env.cmake 2012-07-07 09:14:46 +0000
3+++ cmake/copy_file_install_user_env.cmake 2012-07-12 07:15:25 +0000
4@@ -2,7 +2,11 @@
5 set (INSTALLDIR_USER "" CACHE FORCE "Installation dir if user")
6 set (INSTALLDIR_ROOT "" CACHE FORCE "Installation dir if root")
7
8-set (USERNAME $ENV{USER})
9+if (ENV{USER})
10+ set (USERNAME $ENV{USER})
11+else (ENV${USER})
12+ set (USERNAME "user")
13+endif (ENV{USER})
14
15 if (${USERNAME} STREQUAL "root")
16 set (INSTALLDIR ${INSTALLDIR_ROOT})
17
18=== modified file 'cmake/recompile_gsettings_schemas_in_dir_user_env.cmake'
19--- cmake/recompile_gsettings_schemas_in_dir_user_env.cmake 2012-07-07 09:14:46 +0000
20+++ cmake/recompile_gsettings_schemas_in_dir_user_env.cmake 2012-07-12 07:15:25 +0000
21@@ -1,7 +1,11 @@
22 set (SCHEMADIR_USER "" CACHE FORCE "Installation dir if user")
23 set (SCHEMADIR_ROOT "" CACHE FORCE "Installation dir if root")
24
25-set (USERNAME $ENV{USER})
26+if (ENV{USER})
27+ set (USERNAME $ENV{USER})
28+else (ENV${USER})
29+ set (USERNAME "user")
30+endif (ENV{USER})
31
32 if (${USERNAME} STREQUAL "root")
33 set (SCHEMADIR ${SCHEMADIR_ROOT})

Subscribers

People subscribed via source and target branches