summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2014-06-22 18:07:26 +0000
committerWilliam Hubbs <williamh@gentoo.org>2014-06-22 18:07:26 +0000
commitc35a1ae534832973524bd9d80c5bb89ff440197e (patch)
tree1f40a8cc9b173e1875a625a0b5b36e73c114d7fc /www-client/pybugz
parentUpdate to unifont-7.0.01. (diff)
downloadhistorical-c35a1ae534832973524bd9d80c5bb89ff440197e.tar.gz
historical-c35a1ae534832973524bd9d80c5bb89ff440197e.tar.bz2
historical-c35a1ae534832973524bd9d80c5bb89ff440197e.zip
Move the token support upstream
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0x30C46538
Diffstat (limited to 'www-client/pybugz')
-rw-r--r--www-client/pybugz/ChangeLog6
-rw-r--r--www-client/pybugz/Manifest25
-rw-r--r--www-client/pybugz/files/pybugz-9999-bugzilla-4.4.1.patch76
-rw-r--r--www-client/pybugz/pybugz-9999.ebuild4
4 files changed, 12 insertions, 99 deletions
diff --git a/www-client/pybugz/ChangeLog b/www-client/pybugz/ChangeLog
index 8f2580004bd4..0b49cc9f82f9 100644
--- a/www-client/pybugz/ChangeLog
+++ b/www-client/pybugz/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/pybugz
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/pybugz/ChangeLog,v 1.117 2014/05/21 09:16:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/pybugz/ChangeLog,v 1.118 2014/06/22 18:07:15 williamh Exp $
+
+ 22 Jun 2014; William Hubbs <william@gentoo.org>
+ -files/pybugz-9999-bugzilla-4.4.1.patch, pybugz-9999.ebuild:
+ Move the token support upstream
*pybugz-0.10.1-r2 (21 May 2014)
diff --git a/www-client/pybugz/Manifest b/www-client/pybugz/Manifest
index 35405c30a7aa..11fb153a80bb 100644
--- a/www-client/pybugz/Manifest
+++ b/www-client/pybugz/Manifest
@@ -1,30 +1,17 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
AUX pybugz-0.10.1-bugzilla-4.4.1.patch 1847 SHA256 c18c87373a89893b804f5c94e12b8471d45f08f2aa78d0194346314bc4412642 SHA512 5b77f76d648537bfe6efbfe1161ad44b7e685e0baf380709de9d54b3b5f558d98a60d13ecfdf443e366ec847adfc6360353b02caabc99835d697d0c7532c5cd5 WHIRLPOOL f03d2a041026acea763ae75fee4ef71e3207da109e5b4d47e1fc9a9bbf5937ecd7b4318f102365bcf6a48af1e0edfa65c93ec60503d5ef838c92c0a8c4075389
-AUX pybugz-9999-bugzilla-4.4.1.patch 2057 SHA256 4d943e0f4d4cee09d8bb44971fb8ca44b6a6d128728b08b2db76b4c4105a92ff SHA512 2e23d779df5e48d6e798d23dafa3be590a119649c8f888d9b45139b66c426d0231695b8d80e635605667d5293f61b2c9da92a3ba929665bce6f9f49b9660d55e WHIRLPOOL 58683c56fecccc455600163cb06413666b855dc58a70f0c3a09226cb411188931d1c143e372276c03284c14a5666790eaf0ba8429c01a0ae842619b6767f1477
DIST pybugz-0.10.1.tar.gz 23142 SHA256 e8bd14e11b4c244767216dffcfa1bf5b4058d296638c6509f43dd84be8156cec SHA512 4a4e32e7181c1cafc17dbaac5802908747e8ecd953045f92f2f686b440fcda19bd66ccc5c756548642fbd931a2becf84cae8a6493e6892166b23f12cdaa77036 WHIRLPOOL b343198634926d83a80e0f29dbadadf0dfb09b087b2b8363e84a22ceef6fe438b3fcd4258978e29e9c309e219fa1b855e023efb9d30bba734657c027d96858ce
EBUILD pybugz-0.10.1-r2.ebuild 1306 SHA256 c987b42aaec39b4e50efe1c510bb30e8a340ae28f60293154cee85c0fefe84e9 SHA512 cdf43e745449a0faa1efe22045057a0ae65d8e22fd64a00edd311f8733ab615155d5d27ace5a7b6cb55c13802825fccd3857d114d2da67ddd6de8abec3d461c6 WHIRLPOOL 00f71bab56e9241beb8d39bfa062f606a919bf7d14b06db7fc2b3aa004746075a2a5ebaea88aa3247a1fe0df8e4226e33857f4b2c22bb3c6cc66b4df786345ba
EBUILD pybugz-0.10.1.ebuild 1318 SHA256 b01e9ffc640e25c89d620fa5244a5bbb6915d33757c06332156cef1b806478ed SHA512 7adaa5a346d95d2f9e815e649171cc653e61e84564a6bd28bcbf3cebd4640fa426ba18d9808f580fa7409be01cfcb5985a983635123b95262e01d64d380aa08d WHIRLPOOL c3759b5631ae53ab63f26d979c02765a85cbf6f3e4e0169061e53d9fa327e24ad4dbc5c2158d62f2d7ed988dec0277ffd204333e9aac5ca83533d6617776356a
-EBUILD pybugz-9999.ebuild 1302 SHA256 11cd831c4906ed238602cdb7de4445930cdcd7b957ae7f25c079ad3dea452a4c SHA512 bf02ef6cfef63f6319f6229f464521563f3b0ec058fca9306118ff9c6c6035a361f46eaa5b0631f9c7cd22cefde8a90ea34e7a8ebb67718c4705fca8ff66ced0 WHIRLPOOL 01511084b9eaba9e3939c7e1c14574cc45401f923e7b25d0471db98d1e621b8d857f3e6048261cefdd6f8e0e1784a5cbbca9899e38d7d439878cb78f91ed323b
-MISC ChangeLog 15439 SHA256 37744b29b7adb508ea51de4af147b260103da2bd7b8c7c51535c1931a50acd9b SHA512 255b023d6e23882fd4441eb0f6969df03956b56092ee6407753471e999387229a2ecbd82930eaa48d9246e87f360dae73793340e8f273d9d64a5acbbc6e0995b WHIRLPOOL b3993470ca89295e99226dc0c1dca79dab106f1eefce47b17d0e72f9c82531f665d472ca76ca42023a41d72169f505052bdaa65b23abeb7f1a5701a8e3b4647b
+EBUILD pybugz-9999.ebuild 1253 SHA256 c9ff32ecda420ad061c2cb7ee3f452e3df942f3a075d79d5f5ae53d554a7b0e8 SHA512 fcc2e9bfcf7ada481fa0a5accdb88955c8c5a8666b6c4a8c44dd752657eaa153211a99dee2a2bedd07c5f4a531b1fbad53e439da13bd98867b2a9f15f7b24c5a WHIRLPOOL 1b47d3eaa6821f7611666a6081d3f69927048f94577ab20b852107af6357a3a7fcc06781cf6582a03ba43349a589f8b65f20729000b099fd898073c4946fef88
+MISC ChangeLog 15591 SHA256 6380777e014952ede7afb4b5f2c671bb770ce1eb1139d4b58b5ac03cac12154c SHA512 e854c7cd58985d58096f9bdc5d8a6b9557287e62a45ee8560fb0fc45ec733b2ba55714b7dbb104ffbf0cc1cc42c31a178287d4a558ea64dbfa8653f8e24149b7 WHIRLPOOL 249345ccf7791bd5383a3d36b341fceb07d592ed232b56bef666abad48471db49011d3308ccabe17f5d8aea9c1de5b3248c459cc873ee403decfad0e85a0611c
MISC metadata.xml 209 SHA256 9702266f06a8210e65427d02ae3fa7d4b4d3188866429279a27715e9e9c34bc5 SHA512 205ea975d2acc80bad01cd1be939e75a10b5e165fe39b4107eea9803672c2456554a5314b2daa81f59cbbca5d25c98f08c9f0fcbea7b6927fc2f478b4c92b113 WHIRLPOOL 7e0d16169a317148046f705628c0ce5d7ad2d34c6edc367a46dd4e35c6472e3449aebec3b8b6549273aaee15cacd2d31c3021d17ce07d9c62b4b31ae8c9424d6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQJ8BAEBCgBmBQJTfG7wXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirckIP+wSC5ehCB6RGGSNbQr+sEZNu
-eCXHx633vzFbg15MonwHrXnRpHrRExufDYiZIVsQ+VOQmsRzHZfmmjZ25oX7vylY
-krLWQwJvQM0EjzQDNU4XARuLXtDpeJCCgYQWh+yKQ+O7I50Nd8U4rlZzxw+X736x
-Vpi2RrQ0/pj08v300HHAgzZ0kHMVMbuWfF8QHgsnYsHV4RPOD/RNMuBKaSdN4DJg
-GgXvsDwbY5Vhz0rPVmxhneAlVJJjfaMO73n6GBZHSp7IPFm2kQCfjRWJAH0C+ACO
-oAIgBkbFPfwswh6Z270aOBJBWfaJZujncePa/m+hx51JkCc5fSL6LH/T/0Ltuxnc
-mdwZ8Ly1Pu2LWYBRDVRSEPdEWGPZjVtfVYx9SUrVd3wkafrRYojSst8PRfWX+oEn
-sMVsrzfm39hCZxdhAYEQndN4nfZqngVIbz3W8A+kgKiC5At9y57gX7e3iR4gl8tQ
-Uinl3uasUZIZt3xpES3Doq+3qEXmyfIu6hBm1kyr7Hmu5f7ZPzh/xcprNJ4oxcXN
-KjXXEJ3Vrw1QuijDcZEZ45WPU2HJ0uzh4cXfE5lImuxj8Gj5tI//coJrsDSD+2CE
-bvYpqFYrLkNan0EgHJC5zZ8SkkQULoXWwN7+Akg/HQCPelR1CH8isM0HyhAHKB12
-vo2mq7qEJLgFgAEGP/cK
-=fEba
+iEYEAREIAAYFAlOnG10ACgkQblQW9DDEZTic6QCeMADwfSiRn8c187XxCtmG4zxN
+f+UAn3V+vpkUEttBag+9ThXxVjdmp/3k
+=2Mcn
-----END PGP SIGNATURE-----
diff --git a/www-client/pybugz/files/pybugz-9999-bugzilla-4.4.1.patch b/www-client/pybugz/files/pybugz-9999-bugzilla-4.4.1.patch
deleted file mode 100644
index b24b578f716d..000000000000
--- a/www-client/pybugz/files/pybugz-9999-bugzilla-4.4.1.patch
+++ /dev/null
@@ -1,76 +0,0 @@
- bugz/cli.py | 31 +++++++++++++++++++++++++++----
- 1 file changed, 27 insertions(+), 4 deletions(-)
-
-diff --git a/bugz/cli.py b/bugz/cli.py
-index 5c8261b..ae57a10 100644
---- a/bugz/cli.py
-+++ b/bugz/cli.py
-@@ -29,6 +29,7 @@ BUGZ: ---------------------------------------------------
- """
-
- DEFAULT_COOKIE_FILE = '.bugz_cookie'
-+DEFAULT_TOKEN_FILE = '.bugz_token'
- DEFAULT_NUM_COLS = 80
-
- #
-@@ -135,6 +136,12 @@ class PrettyBugz:
- except IOError:
- pass
-
-+ self.token_file = os.path.join(os.environ['HOME'], DEFAULT_TOKEN_FILE)
-+ try:
-+ self.token = open(self.token_file).read().strip()
-+ except IOError:
-+ self.token = None
-+
- if getattr(args, 'encoding'):
- self.enc = args.encoding
- else:
-@@ -151,16 +158,21 @@ class PrettyBugz:
- def get_input(self, prompt):
- return raw_input(prompt)
-
-+ def set_token(self, *args):
-+ if args and self.token:
-+ args[0]['Bugzilla_token'] = self.token
-+ return args
-+
- def bzcall(self, method, *args):
- """Attempt to call method with args. Log in if authentication is required.
- """
- try:
-- return method(*args)
-+ return method(*self.set_token(*args))
- except xmlrpclib.Fault, fault:
- # Fault code 410 means login required
- if fault.faultCode == 410 and not self.skip_auth:
- self.login()
-- return method(*args)
-+ return method(*self.set_token(*args))
- raise
-
- def login(self, args=None):
-@@ -192,10 +204,21 @@ class PrettyBugz:
- self.bz.User.login(params)
- except xmlrpclib.Fault as fault:
- raise BugzError("Can't login: " + fault.faultString)
-+ log_info('Logging in')
-+ result = self.bz.User.login(params)
-+ if 'token' in result:
-+ self.token = result['token']
-
- if args is not None:
-- self.cookiejar.save()
-- os.chmod(self.cookiejar.filename, 0600)
-+ if self.token:
-+ fd = open(self.token_file, 'w')
-+ fd.write(self.token)
-+ fd.write('\n')
-+ fd.close()
-+ os.chmod(self.token_file, 0600)
-+ else:
-+ self.cookiejar.save()
-+ os.chmod(self.cookiejar.filename, 0600)
-
- def logout(self, args):
- log_info('logging out')
diff --git a/www-client/pybugz/pybugz-9999.ebuild b/www-client/pybugz/pybugz-9999.ebuild
index 8b0d2b82d174..cb89932d3d58 100644
--- a/www-client/pybugz/pybugz-9999.ebuild
+++ b/www-client/pybugz/pybugz-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/pybugz/pybugz-9999.ebuild,v 1.18 2014/05/20 09:42:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/pybugz/pybugz-9999.ebuild,v 1.19 2014/06/22 18:07:15 williamh Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 pypy pypy2_0 )
@@ -27,8 +27,6 @@ IUSE="zsh-completion"
RDEPEND="${DEPEND}
zsh-completion? ( app-shells/zsh )"
-PATCHES=( "${FILESDIR}"/${P}-bugzilla-4.4.1.patch )
-
python_install_all() {
distutils-r1_python_install_all
newbashcomp contrib/bash-completion bugz