From 37612d9e06726fcce774c1a50a17fdb6d7ecf2df Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@redhat.com>
Date: Wed, 14 Jul 2010 20:42:02 -0700
Subject: Make newsources a parent of upload

Now that I know how...
---
 src/fedpkg.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/fedpkg.py')

diff --git a/src/fedpkg.py b/src/fedpkg.py
index 1f2733f..e69f275 100755
--- a/src/fedpkg.py
+++ b/src/fedpkg.py
@@ -881,8 +881,9 @@ packages will be built sequentially.
 
     # upload target takes one or more files as input
     parser_upload = subparsers.add_parser('upload',
+                                          parents = [parser_newsources],
+                                          conflict_handler = 'resolve',
                                           help = 'Upload source files')
-    parser_upload.add_argument('files', nargs = '+')
     parser_upload.set_defaults(command = new_sources, replace = False)
 
     # Get version and release
-- 
cgit