Merge lp:~andrewsomething/python-distutils-extra/fix-lp-1025491 into lp:python-distutils-extra

Proposed by Andrew Starr-Bochicchio
Status: Merged
Merged at revision: 308
Proposed branch: lp:~andrewsomething/python-distutils-extra/fix-lp-1025491
Merge into: lp:python-distutils-extra
Diff against target: 12 lines (+1/-1)
1 file modified
debian/local/python-mkdebian (+1/-1)
To merge this branch: bzr merge lp:~andrewsomething/python-distutils-extra/fix-lp-1025491
Reviewer Review Type Date Requested Status
Martin Pitt (community) Approve
Review via email: mp+124591@code.launchpad.net

Description of the change

This handles Glade .ui files when generating debian/copyright. It strips
"<\/property>" and does sed 's/&lt;/</' | sed 's/&gt;/>/' so line like:

Copyright: (C) 2012 Andrew Starr-Bochicchio &lt;<email address hidden>&gt;</property>

are written like:

Copyright: (C) 2012 Andrew Starr-Bochicchio <email address hidden>

I think we can pretty safely assume that "&lt;" or "&gt;" will not be part of anyone's
proper name or email address.

It also add '*~' to the list of ignored files so we don't pick up old information
or stuff from things like .pot.~1~

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/local/python-mkdebian'
2--- debian/local/python-mkdebian 2012-05-25 04:53:22 +0000
3+++ debian/local/python-mkdebian 2012-09-17 03:04:17 +0000
4@@ -109,7 +109,7 @@
5
6 print >> f, '\nFiles: *'
7
8- cgrep = subprocess.Popen("find -type f ! -name 'COPYING*' ! -name LICENSE ! -name '*.pyc' ! -path '*/.*' ! -path './debian/*' ! -name '*.pot' | xargs grep -hi '(c)' | sed 's/^.*([cC])/Copyright: (C)/' | sort -u",
9+ cgrep = subprocess.Popen("find -type f ! -name 'COPYING*' ! -name LICENSE ! -name '*.pyc' ! -path '*/.*' ! -path './debian/*' ! -name '*.pot' ! -name '*~' | xargs grep -hi '(c)' | sed 's/<\/property>//' | sed 's/&lt;/</' | sed 's/&gt;/>/' | sed 's/^.*([cC])/Copyright: (C)/' | sort -u",
10 shell=True, stdout=subprocess.PIPE)
11 out = cgrep.communicate()[0]
12 assert cgrep.returncode == 0

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: