Merge lp:~pfalcon/linaro-license-protection/tweak-reshuffle-files into lp:~linaro-automation/linaro-license-protection/trunk

Proposed by Paul Sokolovsky
Status: Merged
Merged at revision: 38
Proposed branch: lp:~pfalcon/linaro-license-protection/tweak-reshuffle-files
Merge into: lp:~linaro-automation/linaro-license-protection/trunk
Diff against target: 24 lines (+5/-5)
1 file modified
scripts/jenkins-post-www.sh (+5/-5)
To merge this branch: bzr merge lp:~pfalcon/linaro-license-protection/tweak-reshuffle-files
Reviewer Review Type Date Requested Status
Данило Шеган (community) Approve
Review via email: mp+88500@code.launchpad.net

Description of the change

Additional changes made to reshuffle-files handler script past initial launch. They unbroke few more builds not handled by initial version.

To post a comment you must log in.
Revision history for this message
Данило Шеган (danilo) wrote :

We definitely need to start adding tests for this script as well.

I also wonder if you really want to exit when dir is not found: is lava_job_info transferred directly into the proper location instead?

review: Needs Information
Revision history for this message
Данило Шеган (danilo) wrote :

Clarified on IRC: no dir will be there when LAVA submission is disabled. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/jenkins-post-www.sh'
2--- scripts/jenkins-post-www.sh 2012-01-12 15:30:56 +0000
3+++ scripts/jenkins-post-www.sh 2012-01-13 13:37:31 +0000
4@@ -10,15 +10,15 @@
5 exit 1;
6 fi
7
8-# Paranoid security
9-if echo "$build_path" | grep -q "\."; then
10- echo "No dots in build names please"
11+# Paranoid security - alarm on 2 dots separated only by 0 or more backslahes
12+if echo "$build_path" | grep -q -E '\.\\*\.'; then
13+ echo "No double-dots in build names please"
14 exit 1
15 fi
16
17 if [ ! -d $BASE_PATH/$build_path ]; then
18- echo "ERROR: Expected directory $BASE_PATH/$build_path does not exist"
19- exit 1
20+ echo "WARNING: Expected directory $BASE_PATH/$build_path does not exist"
21+ exit 0
22 fi
23
24 job_dir=$(dirname $build_path)

Subscribers

People subscribed via source and target branches