Merge ~smoser/curtin:fix/curtainer-fix-for-trusty-dpkg-dev into curtin:master

Proposed by Scott Moser
Status: Merged
Approved by: Scott Moser
Approved revision: 922eb33a4581b984482061c6465e80435abc033a
Merged at revision: 922eb33a4581b984482061c6465e80435abc033a
Proposed branch: ~smoser/curtin:fix/curtainer-fix-for-trusty-dpkg-dev
Merge into: curtin:master
Diff against target: 15 lines (+2/-1)
1 file modified
tools/curtainer (+2/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Ryan Harper (community) Approve
Review via email: mp+337185@code.launchpad.net

Commit message

tools: fix curtainer --source with trusty.

Older version of dpkg-parsechangelog in trusty does not seem to
support '--file=<file>' correctly. It does seem to support
--file <file> though. So we'll just use that format.

Description of the change

see commit message

To post a comment you must log in.
Revision history for this message
Ryan Harper (raharper) wrote :

Gnarly! Do we have a way to test this on jenkins prior to committing?

review: Approve
Revision history for this message
Scott Moser (smoser) wrote :

we can't really test on jenkins, or dont really need to.
the point of curtainer is that that all happens in a container.

Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/tools/curtainer b/tools/curtainer
index 3aa71df..525a998 100755
--- a/tools/curtainer
+++ b/tools/curtainer
@@ -186,8 +186,9 @@ main() {
186 inside "$name" tar -C "$isrcd" -cf - . |186 inside "$name" tar -C "$isrcd" -cf - . |
187 tar -C "$getsource" -xf - ||187 tar -C "$getsource" -xf - ||
188 fail "failed to copy source out to $getsource"188 fail "failed to copy source out to $getsource"
189 # 14.04 cannot take --file=<file>. Has to be 2 arguments.
189 src_ver=$(inside "$name" dpkg-parsechangelog \190 src_ver=$(inside "$name" dpkg-parsechangelog \
190 "--file=$isrcd/debian/changelog" "--show-field=version")191 "--file" "$isrcd/debian/changelog" "--show-field=version")
191 if [ "$src_ver" != "$pkg_ver" ]; then192 if [ "$src_ver" != "$pkg_ver" ]; then
192 fail "source version ($src_ver) != package version ($pkg_ver)"193 fail "source version ($src_ver) != package version ($pkg_ver)"
193 fi194 fi

Subscribers

People subscribed via source and target branches