* [gentoo-commits] gentoo-x86 commit in app-misc/goobook/files: goobook-1.4-hcs-utils-1.3.patch
@ 2013-07-08 15:49 Michael Weber (xmw)
0 siblings, 0 replies; 3+ messages in thread
From: Michael Weber (xmw) @ 2013-07-08 15:49 UTC (permalink / raw
To: gentoo-commits
xmw 13/07/08 15:49:08
Added: goobook-1.4-hcs-utils-1.3.patch
Log:
Ebuild update and patch by Justin J. Snelgrove (bug 449916), slightly modified by me.
(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Revision Changes Path
1.1 app-misc/goobook/files/goobook-1.4-hcs-utils-1.3.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/goobook/files/goobook-1.4-hcs-utils-1.3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/goobook/files/goobook-1.4-hcs-utils-1.3.patch?rev=1.1&content-type=text/plain
Index: goobook-1.4-hcs-utils-1.3.patch
===================================================================
https://bugs.gentoo.org/show_bug.cgi?id=449916#c1
diff -uNr goobook-1.4.old/goobook/goobook.py goobook-1.4/goobook/goobook.py
--- goobook-1.4.old/goobook/goobook.py 2012-11-10 08:00:44.000000000 -0500
+++ goobook-1.4/goobook/goobook.py 2013-07-06 23:27:02.091729438 -0400
@@ -37,11 +37,11 @@
import time
import xml.etree.ElementTree as ET
-from hcs_utils.storage import Storage
+from hcs_utils.storage import Storage, storageify, unstorageify
log = logging.getLogger(__name__)
-CACHE_FORMAT_VERSION = '3.2'
+CACHE_FORMAT_VERSION = '4.0'
G_MAX_SRESULTS = 9999 # Maximum number of entries to ask google for.
GDATA_VERSION = '3'
ATOM_NS = '{http://www.w3.org/2005/Atom}'
@@ -243,8 +243,8 @@
log.info('Failed to read the cache file: %s', err)
raise
if cache:
- self.contacts = cache.get('contacts')
- self.groups = cache.get('groups')
+ self.contacts = storageify(cache.get('contacts'))
+ self.groups = storageify(cache.get('groups'))
else:
self.update()
if not self.contacts:
@@ -262,7 +262,7 @@
"""
if self.contacts: # never write a empty addressbook
- cache = {'contacts': self.contacts, 'groups': self.groups, 'goobook_cache': CACHE_FORMAT_VERSION}
+ cache = {'contacts': unstorageify(self.contacts), 'groups': unstorageify(self.groups), 'goobook_cache': CACHE_FORMAT_VERSION}
pickle.dump(cache, open(self.__config.cache_filename, 'wb'))
def get_group(self, id_):
diff -uNr goobook-1.4.old/goobook.egg-info/requires.txt goobook-1.4/goobook.egg-info/requires.txt
--- goobook-1.4.old/goobook.egg-info/requires.txt 2012-11-10 08:01:54.000000000 -0500
+++ goobook-1.4/goobook.egg-info/requires.txt 2013-07-06 23:29:30.206725062 -0400
@@ -1,6 +1,5 @@
-argparse>=1.1
distribute
gdata>=2.0.7
-hcs_utils==1.1.1
+hcs_utils>=1.3
simplejson>=2.1.0
keyring>=0.2
\ No newline at end of file
diff -uNr goobook-1.4.old/setup.py goobook-1.4/setup.py
--- goobook-1.4.old/setup.py 2012-11-10 08:00:44.000000000 -0500
+++ goobook-1.4/setup.py 2013-07-06 23:27:45.351728160 -0400
@@ -58,10 +58,9 @@
""".splitlines() if f.strip()],
license = 'GPLv3',
install_requires = [
- 'argparse>=1.1',
'distribute',
'gdata>=2.0.7',
- 'hcs_utils==1.1.1',
+ 'hcs_utils>=1.3',
'simplejson>=2.1.0',
'keyring>=0.2'],
packages = find_packages(),
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-misc/goobook/files: goobook-1.4-hcs-utils-1.3.patch
@ 2013-07-08 17:26 Michael Weber (xmw)
0 siblings, 0 replies; 3+ messages in thread
From: Michael Weber (xmw) @ 2013-07-08 17:26 UTC (permalink / raw
To: gentoo-commits
xmw 13/07/08 17:26:19
Modified: goobook-1.4-hcs-utils-1.3.patch
Log:
inherit eutils, reference upstream bug reports
(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Revision Changes Path
1.2 app-misc/goobook/files/goobook-1.4-hcs-utils-1.3.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/goobook/files/goobook-1.4-hcs-utils-1.3.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/goobook/files/goobook-1.4-hcs-utils-1.3.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/goobook/files/goobook-1.4-hcs-utils-1.3.patch?r1=1.1&r2=1.2
Index: goobook-1.4-hcs-utils-1.3.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/goobook/files/goobook-1.4-hcs-utils-1.3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- goobook-1.4-hcs-utils-1.3.patch 8 Jul 2013 15:49:08 -0000 1.1
+++ goobook-1.4-hcs-utils-1.3.patch 8 Jul 2013 17:26:19 -0000 1.2
@@ -1,4 +1,5 @@
https://bugs.gentoo.org/show_bug.cgi?id=449916#c1
+reported upstream as http://code.google.com/p/goobook/issues/detail?id=39
diff -uNr goobook-1.4.old/goobook/goobook.py goobook-1.4/goobook/goobook.py
--- goobook-1.4.old/goobook/goobook.py 2012-11-10 08:00:44.000000000 -0500
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-misc/goobook/files: goobook-1.4-hcs-utils-1.3.patch
@ 2015-06-03 9:04 Marc Schiffbauer (mschiff)
0 siblings, 0 replies; 3+ messages in thread
From: Marc Schiffbauer (mschiff) @ 2015-06-03 9:04 UTC (permalink / raw
To: gentoo-commits
mschiff 15/06/03 09:04:51
Removed: goobook-1.4-hcs-utils-1.3.patch
Log:
Bump version + cleanup broken stuff
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x296C6CCA35A64134)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-06-03 9:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-08 17:26 [gentoo-commits] gentoo-x86 commit in app-misc/goobook/files: goobook-1.4-hcs-utils-1.3.patch Michael Weber (xmw)
-- strict thread matches above, loose matches on Subject: below --
2015-06-03 9:04 Marc Schiffbauer (mschiff)
2013-07-08 15:49 Michael Weber (xmw)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox