Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/cygwin-apps/calm.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2016-04-15 14:22:47 +0300
committerJon Turney <jon.turney@dronecode.org.uk>2016-04-18 14:37:16 +0300
commit42eb702159aa211dfcc5d5f9610836d026f1e782 (patch)
tree1479ad89d39b70e2af97f7306bed9ce724387e5e
parentbf9e0b0c476b67646236a1111bdeeaecaf6f9d7a (diff)
Make --pkglist optional in mksetupini
Make --pkglist optional in mksetupini, and don't check package names against the package list it is used.
-rwxr-xr-xmksetupini2
-rwxr-xr-xpackage.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/mksetupini b/mksetupini
index 41d81bf..b43a45a 100755
--- a/mksetupini
+++ b/mksetupini
@@ -98,7 +98,7 @@ if __name__ == "__main__":
parser = argparse.ArgumentParser(description='Make setup.ini')
parser.add_argument('--arch', action='store', required=True, choices=common_constants.ARCHES)
parser.add_argument('--inifile', '-u', action='store', help='output filename', required=True)
- parser.add_argument('--pkglist', action='store', metavar='FILE', help="package maintainer list (default: " + pkglist_default + ")", default=pkglist_default)
+ parser.add_argument('--pkglist', action='store', nargs='?', metavar='FILE', help="package maintainer list (default: " + pkglist_default + ")", const=pkglist_default)
parser.add_argument('--release', action='store', help='value for setup-release key (default: cygwin)', default='cygwin')
parser.add_argument('--releasearea', action='store', metavar='DIR', help="release directory (default: " + relarea_default + ")", default=relarea_default, dest='rel_area')
parser.add_argument('--spell', action='store_true', help='spellcheck text hints')
diff --git a/package.py b/package.py
index 02618c9..f03391d 100755
--- a/package.py
+++ b/package.py
@@ -463,6 +463,9 @@ def validate_packages(args, packages):
#
def validate_package_maintainers(args, packages):
+ if not args.pkglist:
+ return
+
# read maintainer list
mlist = {}
mlist = maintainers.Maintainer.add_packages(mlist, args.pkglist)