Merge ~sespiros/ubuntu-security-tools/+git/ubuntu-security-tools:umt-remove-quilt-check into ubuntu-security-tools:master

Proposed by Spyros Seimenis
Status: Merged
Merged at revision: 277603dcf3a042b6ebdf4f7a740dea7fa518fa6a
Proposed branch: ~sespiros/ubuntu-security-tools/+git/ubuntu-security-tools:umt-remove-quilt-check
Merge into: ubuntu-security-tools:master
Diff against target: 28 lines (+1/-11)
1 file modified
build-tools/umt (+1/-11)
Reviewer Review Type Date Requested Status
Marc Deslauriers Approve
Review via email: mp+418868@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Marc Deslauriers (mdeslaur) wrote :

ACK, as discussed. Please merge.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/build-tools/umt b/build-tools/umt
2index 9416371..e9fe9f2 100755
3--- a/build-tools/umt
4+++ b/build-tools/umt
5@@ -3881,23 +3881,13 @@ def mkstemp_fill(contents,suffix='',prefix='umt-',dir=None):
6 return name
7
8 def validate_toplevel():
9- '''Makes sure we are in a toplevel source directory and it's clean.'''
10+ '''Makes sure we are in a toplevel source directory.'''
11
12 if not os.path.isfile('debian/changelog'):
13 err("Could not find debian/changelog.")
14 err("This tool must be run from a toplevel source directory.")
15 sys.exit(1)
16
17- if os.path.isdir('.pc'):
18- source_format = []
19- if os.path.exists('debian/source/format'):
20- source_format = open("debian/source/format").readline()
21- if '3.0 (quilt)' not in source_format:
22- if os.path.exists('.pc/applied-patches'):
23- err("Found applied-patches in .pc directory. Looks like there are quilt patches applied.")
24- err("Aborting build.")
25- sys.exit(1)
26-
27 def parse_package_details(release = None, skip_sanity = False, force_component = None, override_previous = None, override_sa = None):
28 '''Parse details from the package files.'''
29

Subscribers

People subscribed via source and target branches