opencompute-developers team mailing list archive

[Jeff Marcom <jeff.marcom@xxxxxxxxxxxxx>]

Jeff Marcom has proposed merging lp:~jeffmarcom/opencompute/symlink-bug-fix-1230365 into lp:opencompute/checkbox.

Commit message:
Added a simple check to bypass the symlink creation in an Ubuntu based release.

Requested reviews:
  Open Compute Developers (opencompute-developers)
Related bugs:
  Bug #1230365 in The Open Compute Project: "permissions error when running checkbox-ocp-cli"
  https://bugs.launchpad.net/opencompute/+bug/1230365

For more details, see:
https://code.launchpad.net/~jeffmarcom/opencompute/symlink-bug-fix-1230365/+merge/187560

The symlink only needs to be created in a Centos environment,

This adds a simple check to bypass the symlink creation in an Ubuntu based release.
-- 
https://code.launchpad.net/~jeffmarcom/opencompute/symlink-bug-fix-1230365/+merge/187560
Your team Open Compute Developers is requested to review the proposed merge of lp:~jeffmarcom/opencompute/symlink-bug-fix-1230365 into lp:opencompute/checkbox.

=== modified file 'bin/checkbox-ocp-cli'
--- bin/checkbox-ocp-cli	2013-09-24 02:42:59 +0000
+++ bin/checkbox-ocp-cli	2013-09-25 16:50:24 +0000
@@ -6,7 +6,8 @@
 export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
 export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
 
-if [ ! -s /etc/checkbox.d/configs ]
+grep -q "Ubuntu" /etc/issue
+if [ $? -ne 0 ] && [ ! -L /etc/checkbox.d/configs ]
 then ln -s /usr/share/checkbox/examples /etc/checkbox.d/configs
 fi
 

=== modified file 'bin/checkbox-ocp-gtk'
--- bin/checkbox-ocp-gtk	2013-09-24 02:42:59 +0000
+++ bin/checkbox-ocp-gtk	2013-09-25 16:50:24 +0000
@@ -6,6 +6,11 @@
 export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
 export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
 
+grep -q "Ubuntu" /etc/issue
+if [ $? -ne 0 ] && [ ! -L /etc/checkbox.d/configs ]
+then ln -s /usr/share/checkbox/examples /etc/checkbox.d/configs
+fi
+
 if [ $CHECKBOX_DATA != '.' ]
 then
     old_data=$HOME/.checkbox

=== modified file 'bin/checkbox-ocp-qt'
--- bin/checkbox-ocp-qt	2013-09-24 02:42:59 +0000
+++ bin/checkbox-ocp-qt	2013-09-25 16:50:24 +0000
@@ -9,6 +9,11 @@
 export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
 export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
 
+grep -q "Ubuntu" /etc/issue
+if [ $? -ne 0 ] && [ ! -L /etc/checkbox.d/configs ]
+then ln -s /usr/share/checkbox/examples /etc/checkbox.d/configs
+fi
+
 if [ $CHECKBOX_DATA != '.' ]
 then
     old_data=$HOME/.checkbox

=== modified file 'bin/checkbox-ocp-urwid'
--- bin/checkbox-ocp-urwid	2013-09-24 02:42:59 +0000
+++ bin/checkbox-ocp-urwid	2013-09-25 16:50:24 +0000
@@ -6,6 +6,11 @@
 export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
 export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
 
+grep -q "Ubuntu" /etc/issue
+if [ $? -ne 0 ] && [ ! -L /etc/checkbox.d/configs ]
+then ln -s /usr/share/checkbox/examples /etc/checkbox.d/configs
+fi
+
 if [ $CHECKBOX_DATA != '.' ]
 then
     old_data=$HOME/.checkbox