summaryrefslogtreecommitdiffstats
path: root/src/fedpkg.py
diff options
context:
space:
mode:
authorJesse Keating <jkeating@redhat.com>2011-02-09 16:06:58 -0700
committerJesse Keating <jkeating@redhat.com>2011-02-09 16:06:58 -0700
commit4f38782ef1a0f0d8f6c0eed962bbcb6503579c71 (patch)
tree82639944b25edb6e831e09db3e770480e5fc7431 /src/fedpkg.py
parentf73acaf60b745656f8269a560d846bb8d134355b (diff)
downloadfedora-packager-4f38782ef1a0f0d8f6c0eed962bbcb6503579c71.zip
fedora-packager-4f38782ef1a0f0d8f6c0eed962bbcb6503579c71.tar.gz
fedora-packager-4f38782ef1a0f0d8f6c0eed962bbcb6503579c71.tar.xz
Re-arrange verify-files and slight fixups
Diffstat (limited to 'src/fedpkg.py')
-rwxr-xr-xsrc/fedpkg.py32
1 files changed, 18 insertions, 14 deletions
diff --git a/src/fedpkg.py b/src/fedpkg.py
index b7ac38e..b682b92 100755
--- a/src/fedpkg.py
+++ b/src/fedpkg.py
@@ -501,14 +501,6 @@ def diff(args):
log.error('Could not diff: %s' % e)
sys.exit(1)
-def verify_files(args):
- try:
- mymodule = pyfedpkg.PackageModule(args.path, args.dist)
- return mymodule.verify_files()
- except pyfedpkg.FedpkgError, e:
- log.error('Could not verify %%files list: %s' % e)
- sys.exit(1)
-
def export(args):
# not implimented; not planned
log.warning('Not implimented yet, got %s' % args)
@@ -849,6 +841,13 @@ def update(args):
os.unlink('bodhi.template')
os.unlink('clog')
+def verify_files(args):
+ try:
+ mymodule = pyfedpkg.PackageModule(args.path, args.dist)
+ return mymodule.verify_files()
+ except pyfedpkg.FedpkgError, e:
+ log.error('Could not verify %%files list: %s' % e)
+ sys.exit(1)
def verrel(args):
try:
@@ -1082,12 +1081,6 @@ defined, packages will be built sequentially.""")
help = 'short-circuit compile')
parser_compile.set_defaults(command = compile)
- # Verify %files list locally
- parser_verify_files = subparsers.add_parser('verify-files',
- help='Locally verify %%files section',
- description="Locally run 'rpmbuild -bl' to verify the spec file's %files sections. This is useful after a successful run of 'fedpkg install' or after a 'fedpkg local' run which failed due to %files list inaccuracies.")
- parser_verify_files.set_defaults(command = verify_files)
-
# export the module; not planned
#parser_export = subparsers.add_parser('export',
# help = 'Create a clean export')
@@ -1412,6 +1405,17 @@ defined, packages will be built sequentially.""")
with the new file(s).')
parser_upload.set_defaults(command = new_sources, replace = False)
+ # Verify %files list locally
+ parser_verify_files = subparsers.add_parser('verify-files',
+ help='Locally verify %%files '
+ 'section',
+ description="Locally run \
+ 'rpmbuild -bl' to verify the \
+ spec file's %files sections. \
+ This requires a successful run \
+ of 'fedpkg compile'")
+ parser_verify_files.set_defaults(command = verify_files)
+
# Get version and release
parser_verrel = subparsers.add_parser('verrel',
help = 'Print the '