From e00c4871b4ea55bb4e9f55b1190dee31972dda77 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Dec 16 2013 00:26:44 +0000 Subject: remove tag-request we no longer use that work flow, the process is managed via blocker bugs now 1.15 release --- diff --git a/fedpkg.spec b/fedpkg.spec index d1a500d..2452216 100644 --- a/fedpkg.spec +++ b/fedpkg.spec @@ -2,7 +2,7 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} Name: fedpkg -Version: 1.14 +Version: 1.15 Release: 1%{?dist} Summary: Fedora utility for working with dist-git diff --git a/setup.py b/setup.py index 5f7eeb8..d2eb62f 100755 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from setuptools import setup setup( name = "fedpkg", - version = "1.14", + version = "1.15", author = "Dennis Gilmore", author_email = "dgilmore@fedoraproject.org", description = ("Fedora plugin to rpkg to manage " diff --git a/src/fedpkg.bash b/src/fedpkg.bash index 0be9594..57fff06 100644 --- a/src/fedpkg.bash +++ b/src/fedpkg.bash @@ -38,7 +38,7 @@ _fedpkg() local options_value="--dist --user --path" local commands="build chain-build ci clean clog clone co commit compile diff gimmespec giturl help \ gitbuildurl import install lint local mockbuild mock-config new new-sources patch prep pull push retire scratch-build sources \ - srpm switch-branch tag tag-request unused-patches update upload verify-files verrel" + srpm switch-branch tag unused-patches update upload verify-files verrel" # parse main options and get command @@ -192,9 +192,6 @@ _fedpkg() options_file="--file" after_more=true ;; - tag-request) - options_string="--desc --build" - ;; upload|new-sources) after="file" after_more=true diff --git a/src/fedpkg/cli.py b/src/fedpkg/cli.py index a3621bb..b37b06a 100644 --- a/src/fedpkg/cli.py +++ b/src/fedpkg/cli.py @@ -29,7 +29,6 @@ class fedpkgClient(cliClient): """Register the fedora specific targets""" self.register_retire() - self.register_tagrequest() self.register_update() # Target registry goes here @@ -48,25 +47,6 @@ class fedpkgClient(cliClient): help='Message for retiring the package') retire_parser.set_defaults(command=self.retire) - def register_tagrequest(self): - """Register the tagrequest target""" - - tagrequest_parser = self.subparsers.add_parser('tag-request', - help='Submit current build nvr ' - 'as a releng tag request', - description='This command \ - files a ticket with release \ - engineering, usually for a \ - buildroot override. It will \ - discover the build n-v-r \ - automatically but can be \ - overridden.') - tagrequest_parser.add_argument('--desc', - help='Description of tag request') - tagrequest_parser.add_argument('--build', - help='Override the build n-v-r') - tagrequest_parser.set_defaults(command=self.tagrequest) - def register_update(self): update_parser = self.subparsers.add_parser('update', help='Submit last build as an ' @@ -110,21 +90,6 @@ class fedpkgClient(cliClient): self.log.error('Could not retire package: %s' % e) sys.exit(1) - def tagrequest(self): - self.cmd.tracbaseurl = self.cmd.get('fedpkg', 'tracbaseurl', raw=True) - passwd = getpass.getpass('Password for %s: ' % self.cmd.user) - - if not self.args.desc: - self.args.desc = raw_input('\nAdd a description to your request: ') - - try: - ticket = self.cmd.new_ticket(passwd, self.args.desc, - self.args.build) - print('Ticket #%s filed successfully' % ticket) - except Exception, e: - print('Could not request a tag release: %s' % e) - sys.exit(1) - def _format_update_clog(self, clog): ''' Format clog for the update template. ''' lines = [l for l in clog.split('\n') if l]