Merge lp:~gesha/linaro-android-build-tools/add-build-info-for-lava into lp:linaro-android-build-tools

Proposed by Georgy Redkozubov
Status: Merged
Approved by: Stevan Radaković
Approved revision: 603
Merged at revision: 603
Proposed branch: lp:~gesha/linaro-android-build-tools/add-build-info-for-lava
Merge into: lp:linaro-android-build-tools
Diff against target: 22 lines (+9/-0)
2 files modified
build-scripts/BUILD-INFO_lava.txt (+6/-0)
node/lava-submit (+3/-0)
To merge this branch: bzr merge lp:~gesha/linaro-android-build-tools/add-build-info-for-lava
Reviewer Review Type Date Requested Status
Stevan Radaković Approve
Review via email: mp+160387@code.launchpad.net

Description of the change

Right now if file is listed in build-info.txt and is not present this entry will be lost after merging. With this workaround we will be able to get lava-job-info file listed in merged build-info.txt

To post a comment you must log in.
Revision history for this message
Stevan Radaković (stevanr) wrote :

Looks good.
Approve +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'build-scripts/BUILD-INFO_lava.txt'
2--- build-scripts/BUILD-INFO_lava.txt 1970-01-01 00:00:00 +0000
3+++ build-scripts/BUILD-INFO_lava.txt 2013-04-23 14:33:43 +0000
4@@ -0,0 +1,6 @@
5+Format-Version: 0.1
6+
7+
8+Files-Pattern: lava-job-info*
9+License-Type: open
10+
11
12=== modified file 'node/lava-submit'
13--- node/lava-submit 2012-04-20 16:43:19 +0000
14+++ node/lava-submit 2013-04-23 14:33:43 +0000
15@@ -31,4 +31,7 @@
16 fi
17 fi
18
19+# Add BUILD-INFO.txt support for lava-job-info files
20+cp ${BUILD_SCRIPT_ROOT}/BUILD-INFO_lava.txt out/BUILD-INFO.txt
21+
22 EOF

Subscribers

People subscribed via source and target branches