CI Train [cu2d]

Merge lp:~robru/cupstream2distro/fix-ubuntu-push into lp:cupstream2distro

  1. fix-ubuntu-push
  2. Merge into trunk
Proposed by Robert Bruce Park on 2016-05-03
Status: Merged
Merged at revision: 1398
Proposed branch: lp:~robru/cupstream2distro/fix-ubuntu-push
Merge into: lp:cupstream2distro
Diff against target: 16 lines (+3/-4)
1 file modified
tools/buildpackage.sh (+3/-4)
To merge this branch: bzr merge lp:~robru/cupstream2distro/fix-ubuntu-push
Reviewer Review Type Date Requested Status
CU2D maintainers 2016-05-03 Pending
Review via email: mp+293643@code.launchpad.net

Commit Message

Tweak orig.tar creation.

To post a comment you must log in.
lp:~robru/cupstream2distro/fix-ubuntu-push updated on 2016-05-03
1399. By Robert Bruce Park on 2016-05-03

Revert buildpackage changes.

1400. By Robert Bruce Park on 2016-05-03

Try more explicit excludes.

Colin Watson (cjwatson) wrote :

This probably won't make much difference to the problem at hand, will
it? --exclude-vcs is documented to skip .bzrignore and .gitignore too.

lp:~robru/cupstream2distro/fix-ubuntu-push updated on 2016-05-03
1401. By Robert Bruce Park on 2016-05-03

Exclude only from source tree root.

1402. By Robert Bruce Park on 2016-05-03

Pin debian dir also to source root.

Robert Bruce Park (robru) wrote :

Yeah I'm just iterating a bit on this. Have another look.

lp:~robru/cupstream2distro/fix-ubuntu-push updated on 2016-05-03
1403. By Robert Bruce Park on 2016-05-03

Fix whitespace.

Colin Watson (cjwatson) wrote :

Seems fair if it works :-)

Robert Bruce Park (robru) wrote :

It works in the sense that it successfully strips .bzr* only from the root and not recursively, and the build succeeds & uploads to the PPA, however it's not clear to me that this is actually the Correct behavior, I've asked Steve for his opinion on how to proceed with this.

lp:~robru/cupstream2distro/fix-ubuntu-push updated on 2016-05-03
1404. By Robert Bruce Park on 2016-05-03

Fix dpkg-buildpackage to ignore VCS files.

1405. By Robert Bruce Park on 2016-05-03

Fix regex.

1406. By Robert Bruce Park on 2016-05-03

What if I try...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/buildpackage.sh'
2--- tools/buildpackage.sh 2016-04-06 19:12:11 +0000
3+++ tools/buildpackage.sh 2016-05-03 18:58:27 +0000
4@@ -26,9 +26,8 @@
5 # -sa: Force inclusion of original source.
6 # -d: Do not check build dependencies and conflicts.
7 # -S: Only build source package, no binaries.
8-# -i: Ignore VCS files from generated diff.
9-# -I: Ignore VCS files from generated tarball.
10+# -i: Ignore bzr/git files from generated diff (can only be specified once).
11+# -I: Ignore VCS files from generated tarball, plus .bzr-builddeb which isn't included in default -I
12 # -nc: Do not run `./debian/rules clean`
13 # -k: Sign .changes with this key.
14-# -i'^.bzr' and -I'.bzr*': Ignore .bzr-builddeb which default -i and -I miss.
15-dpkg-buildpackage -sa -d -S -i -i'^.bzr' -I -I'.bzr*' -nc -k"$gpg_key" 1>&2
16+dpkg-buildpackage -sa -d -S -i'(^|/)(\.bzr|\.git)' -I -I'.bzr*' -nc -k"$gpg_key" 1>&2

Subscribers

People subscribed via source and target branches