diff options
author | Scott Moser <smoser@ubuntu.com> | 2014-07-24 08:47:27 -0400 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2014-07-24 08:47:27 -0400 |
commit | 27ce1e10692e93cfb9b87df547de4e0930ec4d28 (patch) | |
tree | c3f6bf75e9949f022fd7b5d464955659474d94e7 /packages | |
parent | d85a03dde58fe4408183b170cf2a8279ad3b96f2 (diff) | |
download | vyos-cloud-init-27ce1e10692e93cfb9b87df547de4e0930ec4d28.tar.gz vyos-cloud-init-27ce1e10692e93cfb9b87df547de4e0930ec4d28.zip |
bddeb: do not sign by default
instead of making the common use case need to pass '-us -uc',
make the less common use case pass '--sign'.
Diffstat (limited to 'packages')
-rwxr-xr-x | packages/bddeb | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/packages/bddeb b/packages/bddeb index 5c538739..a1498d94 100755 --- a/packages/bddeb +++ b/packages/bddeb @@ -39,7 +39,7 @@ PKG_MP = { 'pyyaml': 'python-yaml', 'requests': 'python-requests', } -DEBUILD_ARGS = ["-us", "-S", "-uc", "-d"] +DEBUILD_ARGS = ["-S", "-d"] def write_debian_folder(root, version, revno, append_requires=[]): @@ -104,10 +104,17 @@ def main(): for ent in DEBUILD_ARGS: parser.add_argument(ent, dest="debuild_args", action='append_const', - const=ent, help=("pass through '%s' to debuild" % ent)) + const=ent, help=("pass through '%s' to debuild" % ent), + default=[]) + + parser.add_argument("--sign", default=False, action='store_true', + help="sign result. do not pass -us -uc to debuild") args = parser.parse_args() + if not args.sign: + args.debuild_args.extend(['-us', '-uc']) + os.environ['INIT_SYSTEM'] = args.init_system capture = True @@ -167,7 +174,8 @@ def main(): print("Copied that archive to %r for local usage (if desired)." % (util.abs_join(os.getcwd(), tar_fn))) - print("Running 'debuild' in %r" % (xdir)) + print("Running 'debuild %s' in %r" % (' '.join(args.debuild_args), + xdir)) with util.chdir(xdir): cmd = ['debuild', '--preserve-envvar', 'INIT_SYSTEM'] if args.debuild_args: |