From 1891306b9f4dc98567bcd9507708d8e089e2c69c Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Fri, 28 May 2010 15:36:15 -0400 Subject: [PATCH] make -d/--database the default add --no-database in case someone somewhere needs to do that --- createrepo/__init__.py | 2 +- genpkgmetadata.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/createrepo/__init__.py b/createrepo/__init__.py index 0911ba1..41e8db8 100644 --- a/createrepo/__init__.py +++ b/createrepo/__init__.py @@ -77,7 +77,7 @@ class MetaDataConfig(object): self.max_delta_rpm_size = 100000000 self.update_md_path = None self.skip_stat = False - self.database = False + self.database = True self.outputdir = None self.file_patterns = ['.*bin\/.*', '^\/etc\/.*', '^\/usr\/lib\/sendmail$'] self.dir_patterns = ['.*bin\/.*', '^\/etc\/.*'] diff --git a/genpkgmetadata.py b/genpkgmetadata.py index 5c9f6be..108c68f 100755 --- a/genpkgmetadata.py +++ b/genpkgmetadata.py @@ -64,8 +64,10 @@ def parse_args(args, conf): parser.add_option("-C", "--checkts", default=False, action="store_true", help="check timestamps on files vs the metadata to see " \ "if we need to update") - parser.add_option("-d", "--database", default=False, action="store_true", - help="create sqlite database files") + parser.add_option("-d", "--database", default=True, action="store_true", + help="create sqlite database files: now default, see --no-database to disable") + parser.add_option("--no-database", default=False, dest="nodatabase", action="store_true", + help="do not create sqlite dbs of metadata") # temporarily disabled #parser.add_option("--database-only", default=False, action="store_true", # dest='database_only', @@ -145,7 +147,10 @@ def parse_args(args, conf): if opts.simple_md_filenames: opts.unique_md_filenames = False - + + if opts.nodatabase: + opts.database = False + # let's switch over to using the conf object - put all the opts into it for opt in parser.option_list: if opt.dest is None: # this is fairly silly -- 2.34.1