portage.git
12 years agocatpkgsplit: don't cache results
Zac Medico [Sat, 12 May 2012 07:36:15 +0000 (00:36 -0700)]
catpkgsplit: don't cache results

The cache has been subtly broken since commit
eb2056631021a04b62c228206e44376f5c7a81ba when the eapi parameter was
added. If necessary, we can add a cpv class (or something like that) in
order to avoid redundant catpkgsplit calls in places like
match_from_list.

12 years agoprepstrip/ecompressdir: parallelize operations
Mike Frysinger [Fri, 11 May 2012 16:36:22 +0000 (12:36 -0400)]
prepstrip/ecompressdir: parallelize operations

Stealing some ideas from ferringb, add a new API for doing parallel
processing in bash, and then deploy this with the stripping and
compressing stages.

For stripping coreutils which has about 100 ELFs, this brings time
to strip down from ~7 seconds to ~0.7 seconds on my system.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoAdd portage.eapi.eapi_allows_dots_in_use_flags().
Arfrever Frehtes Taifersar Arahesis [Sat, 12 May 2012 04:07:12 +0000 (06:07 +0200)]
Add portage.eapi.eapi_allows_dots_in_use_flags().

12 years agoAllow dots in package names in EAPI="4-python".
Arfrever Frehtes Taifersar Arahesis [Sat, 12 May 2012 03:58:38 +0000 (05:58 +0200)]
Allow dots in package names in EAPI="4-python".

12 years agoFix handling of empty PORTDIR{,_OVERLAY} setting.
Zac Medico [Sat, 12 May 2012 01:34:36 +0000 (18:34 -0700)]
Fix handling of empty PORTDIR{,_OVERLAY} setting.

12 years agoCleanup profile-formats code. v2.2.0_alpha104
Zac Medico [Fri, 11 May 2012 23:39:06 +0000 (16:39 -0700)]
Cleanup profile-formats code.

12 years agoRepoConfig: sort __slots__
Zac Medico [Fri, 11 May 2012 23:28:05 +0000 (16:28 -0700)]
RepoConfig: sort __slots__

12 years agoAvoid redundant layout.conf parsing.
Zac Medico [Fri, 11 May 2012 23:17:32 +0000 (16:17 -0700)]
Avoid redundant layout.conf parsing.

By passing the RepoConfigLoader instance into LocationsManager, we can
re-use previously parsed layout.conf data. The RepoConfigLoader
instance will also be useful for bug #414961.

12 years agoconfig: load repositories before profile
Zac Medico [Fri, 11 May 2012 22:53:50 +0000 (15:53 -0700)]
config: load repositories before profile

This is useful for bug #414961, since we want to have access to the
repositories when we're loading the profile.

12 years agoconfig: propagate SYNC to self.repositories
Zac Medico [Fri, 11 May 2012 21:49:29 +0000 (14:49 -0700)]
config: propagate SYNC to self.repositories

This resolves a circular dependency on the SYNC variable, which is
useful for bug #414961, since we want to be able to initialize
self.repositories before the SYNC variable is known.

12 years agoconfig: use shlex to split known_repos
Zac Medico [Fri, 11 May 2012 21:04:15 +0000 (14:04 -0700)]
config: use shlex to split known_repos

12 years agoPollScheduler: use local EventLoop (thread safe)
Zac Medico [Fri, 11 May 2012 06:32:26 +0000 (23:32 -0700)]
PollScheduler: use local EventLoop (thread safe)

For API consumers, this makes the doebuild() function compatible with
threads, avoiding a ValueError raised by the signal module, as reported
at http://bugs.sabayon.org/show_bug.cgi?id=3305. Classes derived from
PollScheduler still use the signal module when possible.

12 years agoDon't write or trust cache for unsupported EAPIs.
Zac Medico [Thu, 10 May 2012 21:23:56 +0000 (14:23 -0700)]
Don't write or trust cache for unsupported EAPIs.

Since we're supposed to be able to efficiently obtain the EAPI from
_parse_eapi_ebuild_head, we don't need to write or trust cache entries
for unsupported EAPIs.

12 years agoMake REPOSITORY variable again available in global scope of ebuilds,
Arfrever Frehtes Taifersar Arahesis [Thu, 10 May 2012 19:54:25 +0000 (21:54 +0200)]
Make REPOSITORY variable again available in global scope of ebuilds,
which use EAPI="4-python".
This fixes regression introduced in commit 1c26d24dfc869a6f5ef426f7c02e1d25abcda34e.

12 years agoporttree.py: remove unused imports v2.2.0_alpha103
Zac Medico [Wed, 9 May 2012 22:28:54 +0000 (15:28 -0700)]
porttree.py: remove unused imports

12 years agoRefer to bug #402167 where appropriate.
Zac Medico [Wed, 9 May 2012 22:23:24 +0000 (15:23 -0700)]
Refer to bug #402167 where appropriate.

12 years agodoebuild_environment: clean up EAPI related code
Zac Medico [Wed, 9 May 2012 22:08:08 +0000 (15:08 -0700)]
doebuild_environment: clean up EAPI related code

12 years agoEbuildMetadataPhase: handle empty EAPI from bash
Zac Medico [Wed, 9 May 2012 20:31:52 +0000 (13:31 -0700)]
EbuildMetadataPhase: handle empty EAPI from bash

12 years agoSplit out eapi_invalid function.
Zac Medico [Wed, 9 May 2012 20:00:32 +0000 (13:00 -0700)]
Split out eapi_invalid function.

12 years agoebuild.sh: remove redundant EAPI=0 default
Zac Medico [Wed, 9 May 2012 18:21:15 +0000 (11:21 -0700)]
ebuild.sh: remove redundant EAPI=0 default

12 years agoShow unsatisfied REQUIRED_USE for bug #415125.
Zac Medico [Wed, 9 May 2012 18:10:56 +0000 (11:10 -0700)]
Show unsatisfied REQUIRED_USE for bug #415125.

12 years agodoebuild_environment: remove unused eapi parsing
Zac Medico [Wed, 9 May 2012 08:12:58 +0000 (01:12 -0700)]
doebuild_environment: remove unused eapi parsing

12 years agoParse EAPI with pattern from PMS section 7.3.1.
Zac Medico [Wed, 9 May 2012 06:38:47 +0000 (23:38 -0700)]
Parse EAPI with pattern from PMS section 7.3.1.

This implements the specification that was approved in Gentoo's council
meeting on May 8, 2012 (see bug #402167). The parse-eapi-ebuild-head
FEATURES setting is now enabled by default, and causes non-conformant
ebuilds to be treated as invalid. This behavior will soon become
enabled unconditionally.

12 years agodie: fix ${T}/build.log{,.gz} message
Zac Medico [Wed, 9 May 2012 00:45:53 +0000 (17:45 -0700)]
die: fix ${T}/build.log{,.gz} message

12 years agomake.conf.5: COLLISION_IGNORE s/shell/fnmatch/ v2.2.0_alpha102
Zac Medico [Tue, 8 May 2012 16:38:44 +0000 (09:38 -0700)]
make.conf.5: COLLISION_IGNORE s/shell/fnmatch/

12 years agoStrip EPREFIX in RESTRICT=binchecks QA Notice.
Zac Medico [Tue, 8 May 2012 15:42:12 +0000 (08:42 -0700)]
Strip EPREFIX in RESTRICT=binchecks QA Notice.

12 years agoNEEDED.ELF.2: include sonames from $ORIGIN
Zac Medico [Tue, 8 May 2012 07:39:36 +0000 (00:39 -0700)]
NEEDED.ELF.2: include sonames from $ORIGIN

This reverts the behavior change from bug #205531 (see commit
5baa57a65368472c2c22b9bd2b30e634ef644b92). That special handling should
be unnecessary since the changes from bug #289180 (see commit
296fc63fee262600811520fccf4692f47a39ffba), where the
LinkageMapELF.findConsumers() exclude_providers argument is used to
exclude irrelevant consumers.

12 years agoCOLLISION_IGNORE: support fnmatch patterns
Zac Medico [Tue, 8 May 2012 06:23:40 +0000 (23:23 -0700)]
COLLISION_IGNORE: support fnmatch patterns

This allows it to be combined with the COLLISION_IGNORE_UNOWNED
variable from commit 33545ea18e8816addb3c54bb26a0cc788b8512e6, so only
one variable is needed.

12 years agoCOLLISION_IGNORE: handle prefix
Zac Medico [Sat, 5 May 2012 16:54:14 +0000 (09:54 -0700)]
COLLISION_IGNORE: handle prefix

12 years agoCOLLISION_IGNORE_UNOWNED: tweak default *.py[co]
Zac Medico [Sat, 5 May 2012 16:37:51 +0000 (09:37 -0700)]
COLLISION_IGNORE_UNOWNED: tweak default *.py[co]

12 years agoEnable globstar shell option by default in EAPI="4-python".
Arfrever Frehtes Taifersar Arahesis [Sat, 5 May 2012 16:00:57 +0000 (18:00 +0200)]
Enable globstar shell option by default in EAPI="4-python".

12 years agoQA Notice for RESTRICT=binchecks + ELF files
Zac Medico [Sat, 5 May 2012 07:32:34 +0000 (00:32 -0700)]
QA Notice for RESTRICT=binchecks + ELF files

12 years agoCreate NEEDED.ELF.2 despite RESTRICT=binchecks.
Zac Medico [Sat, 5 May 2012 07:16:41 +0000 (00:16 -0700)]
Create NEEDED.ELF.2 despite RESTRICT=binchecks.

This info is too useful not to have (it's required for things like
preserve-libs), and it's tempting for ebuild authors to set
RESTRICT=binchecks for packages containing pre-built binaries.

12 years agoSupport COLLISION_IGNORE_UNOWNED="*.pyc *.pyo"
Krzysztof Pawlik [Sat, 5 May 2012 06:47:27 +0000 (23:47 -0700)]
Support COLLISION_IGNORE_UNOWNED="*.pyc *.pyo"

This will fix bug #410691.

12 years agocomposite_db._visible: fix AttributeError
Zac Medico [Thu, 3 May 2012 01:32:33 +0000 (18:32 -0700)]
composite_db._visible: fix AttributeError

12 years agodispatch-conf: use shlex to parse diff command
Zac Medico [Wed, 2 May 2012 19:55:31 +0000 (12:55 -0700)]
dispatch-conf: use shlex to parse diff command

12 years agovalidate_desktop_entry: handle Python 3.1
Zac Medico [Tue, 1 May 2012 21:21:44 +0000 (14:21 -0700)]
validate_desktop_entry: handle Python 3.1

12 years agoBug #413983: Add portage.util.urlopen(), which transparently
Arfrever Frehtes Taifersar Arahesis [Tue, 1 May 2012 19:51:16 +0000 (21:51 +0200)]
Bug #413983: Add portage.util.urlopen(), which transparently
handles authentication in the way compatible with Python 3.

12 years agoQuote atoms in die message for bug #414201.
Zac Medico [Tue, 1 May 2012 13:10:42 +0000 (06:10 -0700)]
Quote atoms in die message for bug #414201.

This allows zsh users to copy/paste while avoiding = expansion.

12 years agorepoman: ignore false Service desktop entry error
Zac Medico [Tue, 1 May 2012 02:26:52 +0000 (19:26 -0700)]
repoman: ignore false Service desktop entry error

This will fix bug #414125.

12 years agorepoman: check LIVEVCS.stable for gentoo only
Zac Medico [Mon, 30 Apr 2012 19:17:06 +0000 (12:17 -0700)]
repoman: check LIVEVCS.stable for gentoo only

This will fix bug #414123.

12 years agoebuild.sh: source /etc/portage/env scripts after /etc/portage/bashrc
James Le Cuirot [Sat, 28 Apr 2012 16:33:07 +0000 (17:33 +0100)]
ebuild.sh: source /etc/portage/env scripts after /etc/portage/bashrc

This will fix bug #413895.

12 years agoLocationsManager: empty profiles_complex on error
Zac Medico [Wed, 25 Apr 2012 16:37:48 +0000 (09:37 -0700)]
LocationsManager: empty profiles_complex on error

This prevents an IndexError in code which assumes that profiles and
profiles_complex are the same length.

12 years agorepoman: fix portage.internal false positives
Zac Medico [Mon, 23 Apr 2012 20:15:56 +0000 (13:15 -0700)]
repoman: fix portage.internal false positives

12 years agoEapiDefinition: handle impossible "%d" % None v2.2.0_alpha101
Zac Medico [Sun, 22 Apr 2012 23:01:07 +0000 (16:01 -0700)]
EapiDefinition: handle impossible "%d" % None

12 years agodoebuild: cleanup tempfile if package phase fails
Zac Medico [Sun, 22 Apr 2012 22:11:16 +0000 (15:11 -0700)]
doebuild: cleanup tempfile if package phase fails

12 years agoportageq: use return instead of sys.exit
Zac Medico [Sun, 22 Apr 2012 21:58:55 +0000 (14:58 -0700)]
portageq: use return instead of sys.exit

12 years agodep.__init__: move writemsg import to top
Zac Medico [Sun, 22 Apr 2012 21:41:03 +0000 (14:41 -0700)]
dep.__init__: move writemsg import to top

12 years agorepoman: cleanup code for KEYWORDS.invalid
Zac Medico [Sun, 22 Apr 2012 21:10:07 +0000 (14:10 -0700)]
repoman: cleanup code for KEYWORDS.invalid

12 years agofakedbapi.cp_list: remove obsolete virtual code
Zac Medico [Sun, 22 Apr 2012 20:34:18 +0000 (13:34 -0700)]
fakedbapi.cp_list: remove obsolete virtual code

This should have been included in commit
d30db49bcaecbdeb20f6d4e180979b60b6260f69.

12 years agoPrint working directory in die message to simplify debugging.
Arfrever Frehtes Taifersar Arahesis [Sun, 22 Apr 2012 19:49:49 +0000 (21:49 +0200)]
Print working directory in die message to simplify debugging.

12 years agoportdbapi: update comment about repoman caches
Zac Medico [Sun, 22 Apr 2012 19:13:58 +0000 (12:13 -0700)]
portdbapi: update comment about repoman caches

12 years agodbapi.cp_list: remove special case for virtuals
Zac Medico [Sun, 22 Apr 2012 18:57:25 +0000 (11:57 -0700)]
dbapi.cp_list: remove special case for virtuals

Since commit d603f1440c814377fbc1965729fd9b6b008cf76d, the match caches
use the result from dep_expand for the cache_key, so the caches are
free of old-style virtual mappings. This allows the match caches to be
safely shared with cp_list.

12 years agoAdd ${T}/build.log symlink to PORT_LOGDIR.
Zac Medico [Sun, 22 Apr 2012 17:56:01 +0000 (10:56 -0700)]
Add ${T}/build.log symlink to PORT_LOGDIR.

This will fix bug #412865. This makes it easier on people who
`emerge foo`, do stuff, `emerge foo`, do stuff, etc... to have
the same path to the log in between runs.

12 years agorepoman: support * and ~* keywords
Zac Medico [Sun, 22 Apr 2012 17:41:04 +0000 (10:41 -0700)]
repoman: support * and ~* keywords

These special keywords are used by Funtoo, and have been supported in
KeywordsManager since commit 9144faeb653b9f1dbe74c69f85cd48f26761aa2f.

12 years agodbapi: account for unevaluated_atom in caches
Zac Medico [Sat, 21 Apr 2012 06:38:17 +0000 (23:38 -0700)]
dbapi: account for unevaluated_atom in caches

This will fix bug 412391. This is analogous to the bug fixed in
commit 5438bb29c996d777b6343515995176912a7c137f.

12 years agoShow config updates later for bug #412845.
Zac Medico [Sat, 21 Apr 2012 01:01:30 +0000 (18:01 -0700)]
Show config updates later for bug #412845.

12 years agomergeme: cleanup hardlink_candidates, bug #412453
Greg Turner [Wed, 18 Apr 2012 01:48:32 +0000 (18:48 -0700)]
mergeme: cleanup hardlink_candidates, bug #412453

12 years agoAvoid redundant news display for bug #412161.
Zac Medico [Mon, 16 Apr 2012 07:15:56 +0000 (00:15 -0700)]
Avoid redundant news display for bug #412161.

12 years agorepoman: update EAPI.definition check for PMS
Zac Medico [Sun, 15 Apr 2012 22:21:49 +0000 (15:21 -0700)]
repoman: update EAPI.definition check for PMS

The plan is to update PMS section 8.3.1 as discussed here:

http://archives.gentoo.org/gentoo-pms/msg_ef7635aa655913f2386e64e385f5a6ae.xml

12 years agoHandle SystemError when importing xml libraries.
Zac Medico [Sat, 14 Apr 2012 02:47:13 +0000 (19:47 -0700)]
Handle SystemError when importing xml libraries.

12 years agoperform_all: fix TypeError for bug #411897
Zac Medico [Sat, 14 Apr 2012 00:56:24 +0000 (17:56 -0700)]
perform_all: fix TypeError for bug #411897

12 years agodohtml: support FEATURES=force-prefix
Zac Medico [Sat, 14 Apr 2012 00:37:34 +0000 (17:37 -0700)]
dohtml: support FEATURES=force-prefix

12 years agoportageq mass_best_visible: optional "type" arg
Zdenek Behan [Fri, 13 Apr 2012 21:51:46 +0000 (14:51 -0700)]
portageq mass_best_visible: optional "type" arg

12 years agoEbuildBinpkg: remove temp file on failure
Zac Medico [Fri, 13 Apr 2012 19:30:40 +0000 (12:30 -0700)]
EbuildBinpkg: remove temp file on failure

12 years agoebuild.5: use example.com for bug #411835
Zac Medico [Fri, 13 Apr 2012 18:27:44 +0000 (11:27 -0700)]
ebuild.5: use example.com for bug #411835

12 years agophases.docbook: add phases for new EAPIs
Zac Medico [Wed, 11 Apr 2012 16:55:22 +0000 (09:55 -0700)]
phases.docbook: add phases for new EAPIs

12 years agodepgraph._complete_graph: fix for --root-deps v2.2.0_alpha100
Zac Medico [Thu, 5 Apr 2012 21:37:35 +0000 (14:37 -0700)]
depgraph._complete_graph: fix for --root-deps

12 years agoconfig: populate expand map with profile.env
Zac Medico [Thu, 5 Apr 2012 19:54:28 +0000 (12:54 -0700)]
config: populate expand map with profile.env

This behavior got disabled by commit
ed8a457e265ea1c23b66aeb12d00f1abd3d79e60, and now it's restored.

12 years agoLimit long slot conflict loop for bug #410801.
Zac Medico [Thu, 5 Apr 2012 19:37:40 +0000 (12:37 -0700)]
Limit long slot conflict loop for bug #410801.

12 years agoScheduler: optimize action_uninstall
Zac Medico [Thu, 5 Apr 2012 18:52:51 +0000 (11:52 -0700)]
Scheduler: optimize action_uninstall

12 years agodepgraph._validate_blockers: optimize --root-deps
Zac Medico [Thu, 5 Apr 2012 18:22:49 +0000 (11:22 -0700)]
depgraph._validate_blockers: optimize --root-deps

12 years agodepgraph._load_vdb: optimize --root-deps
Zac Medico [Thu, 5 Apr 2012 18:08:52 +0000 (11:08 -0700)]
depgraph._load_vdb: optimize --root-deps

12 years agoSupport /sys/fs/selinux/context for bug #410687.
Sven Vermeulen [Thu, 5 Apr 2012 16:40:55 +0000 (09:40 -0700)]
Support /sys/fs/selinux/context for bug #410687.

12 years agounmerge: display progress counter, bug #386901
Boris Minev [Tue, 3 Apr 2012 17:56:48 +0000 (10:56 -0700)]
unmerge: display progress counter, bug #386901

12 years agotest_getconfig: add case for bug #410625
Zac Medico [Tue, 3 Apr 2012 16:06:38 +0000 (09:06 -0700)]
test_getconfig: add case for bug #410625

12 years ago_check_temp_dir: explicitly close temp file
Zac Medico [Tue, 3 Apr 2012 15:38:13 +0000 (08:38 -0700)]
_check_temp_dir: explicitly close temp file

12 years agoDon't use varexpand for profile.env, bug #410625. v2.2.0_alpha99
Zac Medico [Tue, 3 Apr 2012 06:52:09 +0000 (23:52 -0700)]
Don't use varexpand for profile.env, bug #410625.

12 years agorepoman: only assume cvs preserves mtimes
Zac Medico [Sun, 1 Apr 2012 17:15:57 +0000 (10:15 -0700)]
repoman: only assume cvs preserves mtimes

12 years agorepoman: disable header/timestamp check for svn v2.2.0_alpha98
Zac Medico [Sun, 1 Apr 2012 16:48:38 +0000 (09:48 -0700)]
repoman: disable header/timestamp check for svn

12 years agodispatch_conf: don't pass bytes for Popen cmd
Zac Medico [Sun, 1 Apr 2012 16:38:27 +0000 (09:38 -0700)]
dispatch_conf: don't pass bytes for Popen cmd

This will fix bug #410417.

12 years agovarexpand: optimize access to current char v2.2.0_alpha97
Zac Medico [Sat, 31 Mar 2012 23:19:04 +0000 (16:19 -0700)]
varexpand: optimize access to current char

12 years agogetconfig: show error message for varexpand fail
Zac Medico [Sat, 31 Mar 2012 21:17:23 +0000 (14:17 -0700)]
getconfig: show error message for varexpand fail

12 years agovarexpand: use frozenset for word characters
Zac Medico [Sat, 31 Mar 2012 20:27:11 +0000 (13:27 -0700)]
varexpand: use frozenset for word characters

12 years agovarexpand: use list for efficient append
Zac Medico [Sat, 31 Mar 2012 19:48:44 +0000 (12:48 -0700)]
varexpand: use list for efficient append

12 years agodispatch_conf: emulate getstatusoutput with Popen
Zac Medico [Sat, 31 Mar 2012 17:22:13 +0000 (10:22 -0700)]
dispatch_conf: emulate getstatusoutput with Popen

This will fix bug #410315.

12 years agoportage.5: note more bashrc caveats, bug #409627
Zac Medico [Fri, 30 Mar 2012 00:17:06 +0000 (17:17 -0700)]
portage.5: note more bashrc caveats, bug #409627

12 years agofowners: return success for prefix if EUID != 0
Zac Medico [Thu, 29 Mar 2012 22:25:23 +0000 (15:25 -0700)]
fowners: return success for prefix if EUID != 0

This is based on a patch by Jeremy Olexa from bug #409893.

12 years agodosym: add $EPREFIX to absolute target
Jeremy Olexa [Thu, 29 Mar 2012 22:02:56 +0000 (15:02 -0700)]
dosym: add $EPREFIX to absolute target

12 years agoxpak: clean up style
Mike Frysinger [Tue, 27 Mar 2012 20:38:18 +0000 (16:38 -0400)]
xpak: clean up style

A few spaces here and there go a long way to making this readable.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agovarexpand: don't cache results
Zac Medico [Wed, 28 Mar 2012 01:49:59 +0000 (18:49 -0700)]
varexpand: don't cache results

Caching wasn't really necessary here, and it didn't properly account
for input differences in the 'mydict' parameter.

12 years agolocks.py: fix _close_fds docstring v2.2.0_alpha96
Zac Medico [Wed, 28 Mar 2012 00:35:59 +0000 (17:35 -0700)]
locks.py: fix _close_fds docstring

12 years agoLockNonblockTestCase: close_fds tweak
Zac Medico [Wed, 28 Mar 2012 00:26:17 +0000 (17:26 -0700)]
LockNonblockTestCase: close_fds tweak

Make consistent with commit 144c23efbb4e9565debad03c13c5bcab833a8336.

12 years agoemerge: suggest dispatch-conf for bug #398843
Zac Medico [Tue, 27 Mar 2012 18:56:32 +0000 (11:56 -0700)]
emerge: suggest dispatch-conf for bug #398843

12 years agoClose fewer file descriptors for fork / no exec.
Zac Medico [Tue, 27 Mar 2012 18:28:12 +0000 (11:28 -0700)]
Close fewer file descriptors for fork / no exec.

This will fix bug #374335.

12 years agoetc-update: handle emacs diff cmd, bug #409849
Zac Medico [Tue, 27 Mar 2012 17:35:44 +0000 (10:35 -0700)]
etc-update: handle emacs diff cmd, bug #409849

12 years agoetc-update: remove duplicate using_editor
Zac Medico [Tue, 27 Mar 2012 17:06:05 +0000 (10:06 -0700)]
etc-update: remove duplicate using_editor

12 years agomovefile: use writemsg for unicode safety
Zac Medico [Tue, 27 Mar 2012 16:28:01 +0000 (09:28 -0700)]
movefile: use writemsg for unicode safety

12 years agoReplace @returns with @return.
Zac Medico [Tue, 27 Mar 2012 15:52:35 +0000 (08:52 -0700)]
Replace @returns with @return.

12 years agograbdict: remove incorrect docstring, bug #409839
Greg Turner [Tue, 27 Mar 2012 15:40:18 +0000 (08:40 -0700)]
grabdict: remove incorrect docstring, bug #409839