Merge lp:~bzoltan/qtcreator-plugin-ubuntu/unnecessary_checks into lp:qtcreator-plugin-ubuntu

Proposed by Zoltan Balogh
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 233
Merged at revision: 234
Proposed branch: lp:~bzoltan/qtcreator-plugin-ubuntu/unnecessary_checks
Merge into: lp:qtcreator-plugin-ubuntu
Diff against target: 39 lines (+0/-22)
1 file modified
share/qtcreator/ubuntu/scripts/click_create_target (+0/-22)
To merge this branch: bzr merge lp:~bzoltan/qtcreator-plugin-ubuntu/unnecessary_checks
Reviewer Review Type Date Requested Status
Benjamin Zeller Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+229314@code.launchpad.net

Commit message

Clean up the unnecessary file and directory checks in the click_create_target

Description of the change

Clean up the unnecessary file and directory checks in the click_create_target

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Benjamin Zeller (zeller-benjamin) wrote :

Ok

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'share/qtcreator/ubuntu/scripts/click_create_target'
2--- share/qtcreator/ubuntu/scripts/click_create_target 2014-08-01 05:29:03 +0000
3+++ share/qtcreator/ubuntu/scripts/click_create_target 2014-08-02 03:36:55 +0000
4@@ -20,9 +20,6 @@
5 SERIES=$3
6 SCRIPTPATH=$(dirname $0)
7
8-CHECK_FILES=("/etc/schroot/chroot.d/click-${FRAMEWORK}-${ARCHITECTURE}")
9-CHECK_DIRS=("/var/lib/schroot/chroots/click-${FRAMEWORK}-${ARCHITECTURE}")
10-
11 click chroot -a $ARCHITECTURE -f $FRAMEWORK exists
12
13 if [ $? -eq 0 ]
14@@ -31,25 +28,6 @@
15 exit 1
16 fi
17
18-
19-for FILE in $CHECK_FILES
20-do
21- if [ -f $FILE ]
22- then
23- echo "The click target click-${FRAMEWORK}-${ARCHITECTURE} exists already"
24- exit 1
25- fi
26-done
27-
28-for DIR in $CHECK_DIRS
29-do
30- if [ -d $DIR ]
31- then
32- echo "The click target click-${FRAMEWORK}-${ARCHITECTURE} exists already"
33- exit 1
34- fi
35-done
36-
37 click chroot -a $ARCHITECTURE -f $FRAMEWORK create
38
39 if [ $? -eq 0 ]

Subscribers

People subscribed via source and target branches

to all changes: