Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-13 08:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename -u -> --dont-sign. Correctly handle fakesyncs from ack-sync.

Browse Source
This commit is contained in:
Stefano Rivera 2010-10-27 23:20:26 +02:00
parent e79ddd9c3a
commit 87e4054245
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ack-sync
View File

@ -71,7 +71,7 @@ def get_source(package, version, section, dist, uploader_name, uploader_email,
if uploader_name is not None: if uploader_name is not None:
cmd += ["-n", uploader_name] cmd += ["-n", uploader_name]
if not upload: if not upload:
cmd += ['-u',] cmd += ['--dont-sign',]
if upload and key is not None: if upload and key is not None:
cmd += ["-k", key] cmd += ["-k", key]
subprocess.check_call(cmd) subprocess.check_call(cmd)
@ -244,6 +244,9 @@ def main(bug_numbers, all_package, all_version, all_section, update,
uploader_name, uploader_email, bug_number, key, uploader_name, uploader_email, bug_number, key,
upload) upload)
if dsc_file.endswith('fakesync1.dsc'):
upload = True
# extract source # extract source
subprocess.check_call(["dpkg-source", "-x", dsc_file]) subprocess.check_call(["dpkg-source", "-x", dsc_file])

4
debian/changelog vendored
View File

@ -20,12 +20,12 @@ ubuntu-dev-tools (0.105) UNRELEASED; urgency=low
- Add a warning that the use of syncpackage is discouraged. - Add a warning that the use of syncpackage is discouraged.
- Correct and neaten options. - Correct and neaten options.
* syncpackage: * syncpackage:
- Add -u parameter, to disable signing. - Add --dont-sign parameter, for test builds.
[ Christopher James Halse Rogers ] [ Christopher James Halse Rogers ]
* mk-sbuild: Add support for btrfs-snapshot based chroots * mk-sbuild: Add support for btrfs-snapshot based chroots
-- Stefano Rivera <stefanor@ubuntu.com> Tue, 26 Oct 2010 12:31:55 +0200 -- Stefano Rivera <stefanor@ubuntu.com> Wed, 27 Oct 2010 23:20:06 +0200
ubuntu-dev-tools (0.104) experimental; urgency=low ubuntu-dev-tools (0.104) experimental; urgency=low

2
doc/syncpackage.1
View File

@ -50,7 +50,7 @@ DEBFULLNAME and DEBEMAIL.
\fB\-k\fI KEYID\fR, \fB\-\-key\fR=\fIKEYID\fR \fB\-k\fI KEYID\fR, \fB\-\-key\fR=\fIKEYID\fR
Specify the key ID to be used for signing. Specify the key ID to be used for signing.
.TP .TP
\fB\-u\fR, \fB\-\-unsigned\fR \fB\-\-dont-sign\fR
Do not sign the upload. Do not sign the upload.
.TP .TP
\fB\-b\fI BUG\fR, \fB\-\-bug\fR=\fIBUG\fR \fB\-b\fI BUG\fR, \fB\-\-bug\fR=\fIBUG\fR

8
syncpackage
View File

@ -347,13 +347,15 @@ def sync_dsc(script_name, dscurl, debian_dist, release, name, email, bugs, keyid
# Build source package # Build source package
cmd = ["debuild", "--no-lintian", "-S", "-v" + cur_ver.full_version] cmd = ["debuild", "--no-lintian", "-S", "-v" + cur_ver.full_version]
env = os.environ
env['DEB_VENDOR'] = 'Ubuntu'
if need_orig: if need_orig:
cmd += ['-sa'] cmd += ['-sa']
if not keyid is None: if keyid:
cmd += ["-k" + keyid] cmd += ["-k" + keyid]
if verbose: if verbose:
print_command(script_name, cmd) print_command(script_name, cmd)
subprocess.check_call(cmd) subprocess.check_call(cmd, env=env)
def get_debian_dscurl(package, dist, release, version=None, component=None): def get_debian_dscurl(package, dist, release, version=None, component=None):
if dist is None: if dist is None:
@ -414,7 +416,7 @@ if __name__ == "__main__":
default = os.environ["DEBEMAIL"]) default = os.environ["DEBEMAIL"])
parser.add_option("-k", "--key", dest="keyid", parser.add_option("-k", "--key", dest="keyid",
help="Specify the key ID to be used for signing.", default=None) help="Specify the key ID to be used for signing.", default=None)
parser.add_option('-u', '--unsigned', dest='keyid', action='store_false', parser.add_option('--dont-sign', dest='keyid', action='store_false',
help='Do not sign the upload') help='Do not sign the upload')
parser.add_option("-b", "--bug", metavar="BUG", parser.add_option("-b", "--bug", metavar="BUG",
help="Mark a Launchpad bug as being fixed by this upload", help="Mark a Launchpad bug as being fixed by this upload",