Merge lp:~jelmer/bzr-builddeb/ignore-bzrignore into lp:bzr-builddeb

Proposed by Jelmer Vernooij
Status: Merged
Merged at revision: 543
Proposed branch: lp:~jelmer/bzr-builddeb/ignore-bzrignore
Merge into: lp:bzr-builddeb
Diff against target: 59 lines (+17/-5)
3 files modified
cmds.py (+6/-1)
debian/changelog (+7/-0)
util.py (+4/-4)
To merge this branch: bzr merge lp:~jelmer/bzr-builddeb/ignore-bzrignore
Reviewer Review Type Date Requested Status
Bzr-builddeb-hackers Pending
Review via email: mp+53129@code.launchpad.net

Description of the change

When detecting if there is an upstream source present, ignore any .bzrignore files.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

On Sat, 12 Mar 2011 14:39:17 -0000, Jelmer Vernooij <email address hidden> wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/bzr-builddeb/ignore-bzrignore into lp:bzr-builddeb.
>
> Requested reviews:
> Bzr-builddeb-hackers (bzr-builddeb-hackers)
>
> For more details, see:
> https://code.launchpad.net/~jelmer/bzr-builddeb/ignore-bzrignore/+merge/53129
>
> When detecting if there is an upstream source present, ignore any .bzrignore files.

Hi,

I don't think this was the change you submitted.

Thanks,

James

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmds.py'
2--- cmds.py 2011-03-04 18:29:16 +0000
3+++ cmds.py 2011-03-12 14:38:53 +0000
4@@ -702,7 +702,12 @@
5 version = primary_upstream_source.get_latest_version(
6 package, current_version)
7 if version is None:
8- raise BzrCommandError("You must specify the version number using --version.")
9+ if upstream_branch_source is not None:
10+ raise BzrCommandError("You must specify the version "
11+ "number using --version or specify --snapshot to "
12+ "merge a snapshot from the upstream branch.")
13+ else:
14+ raise BzrCommandError("You must specify the version number using --version.")
15 assert isinstance(version, str)
16 note("Using version string %s." % (version))
17 # Look up the revision id from the version string
18
19=== modified file 'debian/changelog'
20--- debian/changelog 2011-03-11 01:12:42 +0000
21+++ debian/changelog 2011-03-12 14:38:53 +0000
22@@ -1,3 +1,10 @@
23+bzr-builddeb (2.7.1) unstable; urgency=low
24+
25+ * Add Ubuntu oneiric and Debian wheezy to the list of supported
26+ distributions.
27+
28+ -- Jelmer Vernooij <jelmer@debian.org> Fri, 11 Mar 2011 11:18:52 +0100
29+
30 bzr-builddeb (2.7) unstable; urgency=low
31
32 [ James Westby ]
33
34=== modified file 'util.py'
35--- util.py 2011-02-28 13:11:48 +0000
36+++ util.py 2011-03-12 14:38:53 +0000
37@@ -76,12 +76,12 @@
38 )
39
40
41-DEBIAN_RELEASES = ('woody', 'sarge', 'etch', 'lenny', 'squeeze', 'stable',
42- 'testing', 'unstable', 'experimental', 'frozen', 'sid')
43+DEBIAN_RELEASES = ('woody', 'sarge', 'etch', 'lenny', 'squeeze', 'wheezy',
44+ 'stable', 'testing', 'unstable', 'experimental', 'frozen', 'sid')
45 DEBIAN_POCKETS = ('', '-security', '-proposed-updates', '-backports')
46 UBUNTU_RELEASES = ('warty', 'hoary', 'breezy', 'dapper', 'edgy',
47 'feisty', 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic',
48- 'lucid', 'maverick', 'natty')
49+ 'lucid', 'maverick', 'natty', "oneiric")
50 UBUNTU_POCKETS = ('', '-proposed', '-updates', '-security', '-backports')
51
52
53@@ -626,7 +626,7 @@
54 if root is None:
55 return False # Empty tree
56 present_files = set(root.children.keys())
57- packaging_files = frozenset(["debian", ".bzr-builddeb"])
58+ packaging_files = frozenset(["debian", ".bzr-builddeb", ".bzrignore"])
59 return (len(present_files - packaging_files) > 0)
60
61

Subscribers

People subscribed via source and target branches