portage.git
13 years agoOptimize merge list display with Package attrs.
Zac Medico [Sat, 25 Dec 2010 00:40:21 +0000 (16:40 -0800)]
Optimize merge list display with Package attrs.

13 years agoFix merge list repo display breakage.
Zac Medico [Thu, 23 Dec 2010 18:44:04 +0000 (10:44 -0800)]
Fix merge list repo display breakage.

Broken since refactoring in commit
48c8cec7c079cb07a4f421a36cdc46a7fdbc7811.

13 years agoFix portage restart warning message.
Zac Medico [Wed, 22 Dec 2010 22:15:18 +0000 (14:15 -0800)]
Fix portage restart warning message.

13 years agoRefactor depgraph merge list display code.
Brian Dolbec [Wed, 22 Dec 2010 21:31:08 +0000 (13:31 -0800)]
Refactor depgraph merge list display code.

13 years agoemerge --changelog: repo support for binpkgs
Zac Medico [Wed, 22 Dec 2010 20:19:13 +0000 (12:19 -0800)]
emerge --changelog: repo support for binpkgs

13 years agoPackage.operation: eliminate duplicate code
Zac Medico [Wed, 22 Dec 2010 19:35:29 +0000 (11:35 -0800)]
Package.operation: eliminate duplicate code

13 years agodoebuild: remove unused emerge/returnpid logic v2.2.0_alpha10
Zac Medico [Tue, 21 Dec 2010 18:02:18 +0000 (10:02 -0800)]
doebuild: remove unused emerge/returnpid logic

13 years agoDisplay relevant FEATURES before setup phase
Zac Medico [Tue, 21 Dec 2010 17:35:25 +0000 (09:35 -0800)]
Display relevant FEATURES before setup phase

Thanks to Christian Ruppert <idl0r@gentoo.org> for the suggestion.

13 years agodoebuild: fix more bug #349273
Zac Medico [Tue, 21 Dec 2010 17:05:01 +0000 (09:05 -0800)]
doebuild: fix more bug #349273

13 years agodoebuild: fix bug #349273
Zac Medico [Tue, 21 Dec 2010 16:29:39 +0000 (08:29 -0800)]
doebuild: fix bug #349273

Since commit 75d3130fc8293fff68389b8fed44b8d47a0abe80, doebuild()
for the 'setup' phase triggers the actionmap_deps code path in order
to call the 'pretend' phase as a dependency. This path previously
assumed a portdbapi instance, which may not hold for some api consumers
such as entropy. Therefore, fix the code path to work with other dbapi
types.

13 years ago_lazy_vars: fix repo argument for license_manager
Zac Medico [Tue, 21 Dec 2010 00:07:11 +0000 (16:07 -0800)]
_lazy_vars: fix repo argument for license_manager

13 years agosaveNomergeFavorites: remove unecessary vars
Zac Medico [Mon, 20 Dec 2010 15:53:43 +0000 (07:53 -0800)]
saveNomergeFavorites: remove unecessary vars

13 years agosaveNomergeFavorites: fix possible root confusion
Zac Medico [Mon, 20 Dec 2010 15:47:48 +0000 (07:47 -0800)]
saveNomergeFavorites: fix possible root confusion

13 years agoUse write_atomic to rewrite lafiles.
Zac Medico [Mon, 20 Dec 2010 13:48:39 +0000 (05:48 -0800)]
Use write_atomic to rewrite lafiles.

This should succeed even in some cases in which a normal write might
fail due to file permission settings on some operating systems such as
HP-UX.

13 years agoSubstitute bash builtin >> for touch command.
Zac Medico [Mon, 20 Dec 2010 03:33:26 +0000 (19:33 -0800)]
Substitute bash builtin >> for touch command.

It should be faster to use the bash builtin, and also allows us to
avoid issues with touch breakage (like in bug #348640).

13 years agoprepos_order: avoid duplicates from aliases
Zac Medico [Mon, 20 Dec 2010 00:42:31 +0000 (16:42 -0800)]
prepos_order: avoid duplicates from aliases

13 years agoREQUIRED_USE: describe ^^ as exactly-one-of
Zac Medico [Sun, 19 Dec 2010 18:12:42 +0000 (10:12 -0800)]
REQUIRED_USE: describe ^^ as exactly-one-of

13 years agoparen_enclose: preserve atom USE conditionals
Zac Medico [Sun, 19 Dec 2010 17:57:18 +0000 (09:57 -0800)]
paren_enclose: preserve atom USE conditionals

The depgraph sometimes uses paren_enclose to temporarily convert parts
of use_reduce output to a plain string. In these cases, we want to
preserve atom USE conditionals, since these sometimes make a difference
for IUSE checks during package matching (as in bug #348389).

13 years agorepoman: ignore deprecated profiles.desc entries
Zac Medico [Sat, 18 Dec 2010 15:01:16 +0000 (07:01 -0800)]
repoman: ignore deprecated profiles.desc entries

13 years agodigestcheck: avoid display of u'' from KeyError
Zac Medico [Fri, 17 Dec 2010 21:08:16 +0000 (13:08 -0800)]
digestcheck: avoid display of u'' from KeyError

In python-2.x, KeyError.__str__ produces unicode literals that we
don't want users to see.

13 years agorepoman: handle ElementTree.ParseError
Zac Medico [Fri, 17 Dec 2010 20:12:54 +0000 (12:12 -0800)]
repoman: handle ElementTree.ParseError

13 years agogetbinpkg.py: auto-handle NotImplementedError
Zac Medico [Thu, 16 Dec 2010 20:29:22 +0000 (12:29 -0800)]
getbinpkg.py: auto-handle NotImplementedError

This should have been done as part of bug #338190.

13 years agogetbinpkg.py: use local HTTPSConnection import v2.2.0_alpha9
Zac Medico [Thu, 16 Dec 2010 07:24:16 +0000 (23:24 -0800)]
getbinpkg.py: use local HTTPSConnection import

Use local import since https typically isn't needed, and this way we
can usually avoid triggering the global scope http.client ImportError
handler (like during stage1 -> stage2 builds where USE=ssl is disabled
for python).

13 years agoslot_conflict_handler: fix for bug #348389
Zac Medico [Thu, 16 Dec 2010 02:55:53 +0000 (18:55 -0800)]
slot_conflict_handler: fix for bug #348389

This fixes a broken assumption about USE dep matching behavior,
since commit 766988aa56bb1bbd2796f96946e62ed78cdf259 introduced
stricter IUSE matching by using Atom.unevaluated_atom for IUSE
checks (thus changing behavior in cases where conditional USE
dependencies disappear upon evaluation).

13 years agoAtom.without_use: handle unevaluated_atom.use
Zac Medico [Thu, 16 Dec 2010 02:41:24 +0000 (18:41 -0800)]
Atom.without_use: handle unevaluated_atom.use

Atom.unevaluated_atom.use is used for IUSE checks when matching
packages, so it must not propagate to Atom.without_use.

13 years agohighlight_violations: handle unversioned atom
Zac Medico [Thu, 16 Dec 2010 01:21:13 +0000 (17:21 -0800)]
highlight_violations: handle unversioned atom

A test case is included, which triggers the previously broken case.

13 years agoremoveFromContents: don't use EROOT
Fabian Groffen [Wed, 15 Dec 2010 17:58:45 +0000 (18:58 +0100)]
removeFromContents: don't use EROOT

Fix bug #348790, make sure that CONTENTS entries keep their EPREFIX, by
using ROOT, instead of EROOT.

13 years agoetc-update: eliminate duplicate example configs
Zac Medico [Tue, 14 Dec 2010 04:29:10 +0000 (20:29 -0800)]
etc-update: eliminate duplicate example configs

13 years agoapply_recursive_permissions: don't follow symlink
Zac Medico [Tue, 14 Dec 2010 03:47:27 +0000 (19:47 -0800)]
apply_recursive_permissions: don't follow symlink

This will fix the following error, reported in bug #339670:

_ebuild_exit
    _post_phase_userpriv_perms(settings)
  File "/usr/lib64/portage/pym/portage/package/ebuild/doebuild.py", line 1207,
in _post_phase_userpriv_perms
    filemode=0o60, filemask=0)
  File "/usr/lib64/portage/pym/portage/util/__init__.py", line 1018, in
apply_recursive_permissions
    uid=uid, gid=gid, mode=filemode, mask=filemask)
  File "/usr/lib64/portage/pym/portage/util/__init__.py", line 1043, in
apply_secpass_permissions
    stat_cached = os.stat(filename)
  File "/usr/lib64/portage/pym/portage/__init__.py", line 226, in __call__
    rval = self._func(*wrapped_args, **wrapped_kwargs)
OSError: [Errno 40] Too many levels of symbolic links:
'/var/tmp/portage/dev-vcs/mercurial-1.7.2/temp/tests-2.7/child0/test-mq-symlinks.t/linka'

13 years agoetc-update: tweak style in do_distconf()
Anthony Basile [Tue, 14 Dec 2010 01:35:57 +0000 (20:35 -0500)]
etc-update: tweak style in do_distconf()

13 years agoetc-update: replace 'seq' with pure bash v2.2.0_alpha8
Zac Medico [Mon, 13 Dec 2010 06:22:53 +0000 (22:22 -0800)]
etc-update: replace 'seq' with pure bash

13 years agoetc-update: add option to save example config
Anthony Basile [Sun, 12 Dec 2010 23:30:45 +0000 (18:30 -0500)]
etc-update: add option to save example config

This will fix bug #348561.

13 years agoloadResumeCommand: select first matched package
Zac Medico [Mon, 13 Dec 2010 01:55:50 +0000 (17:55 -0800)]
loadResumeCommand: select first matched package

We need to break out of the loop after the first match here, since
the first package comes from the highest priority repo.

13 years agoxtermTitleReset: revert behavior for bug #348460
Zac Medico [Sun, 12 Dec 2010 12:36:20 +0000 (04:36 -0800)]
xtermTitleReset: revert behavior for bug #348460

13 years agoBinpkgVerifier: don't unlink emerge-fetch.log
Zac Medico [Sun, 12 Dec 2010 10:21:50 +0000 (02:21 -0800)]
BinpkgVerifier: don't unlink emerge-fetch.log

13 years agoPreserve existing hardlinks during merge.
Zac Medico [Wed, 8 Dec 2010 19:23:48 +0000 (11:23 -0800)]
Preserve existing hardlinks during merge.

The previous code created hardlinks rather aggressively, which was
helpful as a workaround for lack of hardlinks in tarballs created
by quickpkg due to bug #185305. Since bug #338509, quickpkg tarballs
preserve hardlinks, so there's no need for aggressive hardlink
creation. Therefore, simply preserve existing hardlinks during merge,
by comparison of st_dev and st_ino from the source files.

13 years agoquickpkg: revert hardlink fix from bug #185305
Zac Medico [Wed, 8 Dec 2010 05:25:23 +0000 (21:25 -0800)]
quickpkg: revert hardlink fix from bug #185305

For some reason, bug #185305 no longer seems to be an issue, and the
fix/workaround seems to cause bug 338509.

13 years agoquickpkg: may -> might reword
Mike Frysinger [Wed, 8 Dec 2010 04:17:38 +0000 (23:17 -0500)]
quickpkg: may -> might reword

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
13 years agoScheduler: fix pkg cache more for reposyntax
Zac Medico [Tue, 7 Dec 2010 19:21:53 +0000 (11:21 -0800)]
Scheduler: fix pkg cache more for reposyntax

13 years agoScheduler: fix pkg cache for reposyntax
Zac Medico [Tue, 7 Dec 2010 09:10:34 +0000 (01:10 -0800)]
Scheduler: fix pkg cache for reposyntax

13 years agoUse bytes literals.
Arfrever Frehtes Taifersar Arahesis [Mon, 6 Dec 2010 12:50:52 +0000 (13:50 +0100)]
Use bytes literals.

13 years agoinject binpkg after fetch for pkg_pretend v2.2.0_alpha7
Zac Medico [Mon, 6 Dec 2010 00:56:04 +0000 (16:56 -0800)]
inject binpkg after fetch for pkg_pretend

13 years agoFix pkg_pretend output and error handling.
Zac Medico [Mon, 6 Dec 2010 00:07:48 +0000 (16:07 -0800)]
Fix pkg_pretend output and error handling.

13 years agoScheduler: Always display message for pkg_pretend
Zac Medico [Sun, 5 Dec 2010 23:15:09 +0000 (15:15 -0800)]
Scheduler: Always display message for pkg_pretend

13 years agodbapi.match: Use IUSE to validate built USE
Zac Medico [Sun, 5 Dec 2010 22:36:16 +0000 (14:36 -0800)]
dbapi.match: Use IUSE to validate built USE

13 years agoebuild.sh: only run pretend once for ebuild(1)
Zac Medico [Sun, 5 Dec 2010 22:09:38 +0000 (14:09 -0800)]
ebuild.sh: only run pretend once for ebuild(1)

13 years agoSync EMERGE_FROM code with MERGE_TYPE code.
Zac Medico [Sun, 5 Dec 2010 11:08:54 +0000 (03:08 -0800)]
Sync EMERGE_FROM code with MERGE_TYPE code.

13 years agoPackage: Use IUSE to validate built USE
Zac Medico [Sun, 5 Dec 2010 00:58:58 +0000 (16:58 -0800)]
Package: Use IUSE to validate built USE

13 years agodoebuild: enable pretend phase as setup dep
Zac Medico [Sat, 4 Dec 2010 20:00:21 +0000 (12:00 -0800)]
doebuild: enable pretend phase as setup dep

13 years agodoebuild: set MERGE_TYPE for ebuild(1)
Zac Medico [Sat, 4 Dec 2010 19:46:55 +0000 (11:46 -0800)]
doebuild: set MERGE_TYPE for ebuild(1)

13 years agoScheduler: set MERGE_TYPE for pkg_pretend
Zac Medico [Sat, 4 Dec 2010 19:45:49 +0000 (11:45 -0800)]
Scheduler: set MERGE_TYPE for pkg_pretend

13 years agoEAPI 4: Support MERGE_TYPE (bug #347351)
Zac Medico [Sat, 4 Dec 2010 03:55:18 +0000 (19:55 -0800)]
EAPI 4: Support MERGE_TYPE (bug #347351)

13 years agoScheduler._run_pkg_pretend: call setcpv
Zac Medico [Sat, 4 Dec 2010 03:51:21 +0000 (19:51 -0800)]
Scheduler._run_pkg_pretend: call setcpv

13 years agoconfig.reset: re-initialize _setcpv_args_hash
Zac Medico [Sat, 4 Dec 2010 03:49:17 +0000 (19:49 -0800)]
config.reset: re-initialize _setcpv_args_hash

13 years agoREQUIRED_USE: test empty parenthesis
Zac Medico [Sat, 4 Dec 2010 01:10:41 +0000 (17:10 -0800)]
REQUIRED_USE: test empty parenthesis

13 years agofix QA_EXECSTACK spelling for QA_PREBUILT
Zac Medico [Thu, 2 Dec 2010 22:02:36 +0000 (14:02 -0800)]
fix QA_EXECSTACK spelling for QA_PREBUILT

Thanks to Sébastien Fabbro <bicatali@gentoo.org> for reporting in
bug #346847.

13 years agocpv_sort_key: test suffix order
Zac Medico [Thu, 2 Dec 2010 16:15:17 +0000 (08:15 -0800)]
cpv_sort_key: test suffix order

13 years agoadd new cpv_sort_key() function
Zac Medico [Thu, 2 Dec 2010 03:56:44 +0000 (19:56 -0800)]
add new cpv_sort_key() function

13 years agoAdd note about colordiff and less -R.
Zac Medico [Thu, 2 Dec 2010 00:28:42 +0000 (16:28 -0800)]
Add note about colordiff and less -R.

13 years agofix AttributeError in recent use dep changes
Zac Medico [Wed, 1 Dec 2010 00:46:52 +0000 (16:46 -0800)]
fix AttributeError in recent use dep changes

13 years agovardbapi: unicode safe UnpicklingError message
Zac Medico [Tue, 30 Nov 2010 20:19:13 +0000 (12:19 -0800)]
vardbapi: unicode safe UnpicklingError message

Thanks to Fabio Erculiani <lxnay@gentoo.org> for reporting a
UnicodeDecodeError here.

13 years agodbapi: remove redundant missing_enabled/disabled
Zac Medico [Tue, 30 Nov 2010 06:16:32 +0000 (22:16 -0800)]
dbapi: remove redundant missing_enabled/disabled

13 years agodbapi: sync USE match logic with depgraph
Zac Medico [Tue, 30 Nov 2010 06:08:12 +0000 (22:08 -0800)]
dbapi: sync USE match logic with depgraph

This changes the IUSE check to use the unevaluated atom, and fixes
some missing_enabled/disabled cases.

13 years agomatch_from_list: use unevaluated_atom for IUSE
Zac Medico [Tue, 30 Nov 2010 06:06:35 +0000 (22:06 -0800)]
match_from_list: use unevaluated_atom for IUSE

13 years agomatch_from_list: sync USE dep logic with depgraph
Zac Medico [Tue, 30 Nov 2010 05:55:50 +0000 (21:55 -0800)]
match_from_list: sync USE dep logic with depgraph

This changes the IUSE check to use the unevaluated atom, and fixes
some missing_enabled/disabled cases.

13 years agodepgraph: remove redundant IUSE check
Zac Medico [Tue, 30 Nov 2010 05:53:19 +0000 (21:53 -0800)]
depgraph: remove redundant IUSE check

13 years agofix missing_enabled/disabled logic for bug 345979
Zac Medico [Tue, 30 Nov 2010 04:48:15 +0000 (20:48 -0800)]
fix missing_enabled/disabled logic for bug 345979

13 years agodepgraph: fix logic more for bug 345979 v2.2.0_alpha6
Zac Medico [Sat, 27 Nov 2010 15:43:38 +0000 (07:43 -0800)]
depgraph: fix logic more for bug 345979

13 years agostack_lists: optimize repo handling more
Zac Medico [Sat, 27 Nov 2010 14:19:50 +0000 (06:19 -0800)]
stack_lists: optimize repo handling more

13 years agodepgraph: fix logic in code for bug 345979
Zac Medico [Sat, 27 Nov 2010 08:44:11 +0000 (00:44 -0800)]
depgraph: fix logic in code for bug 345979

13 years agoUseManager: make warnings show even with --quiet
Zac Medico [Sat, 27 Nov 2010 07:42:12 +0000 (23:42 -0800)]
UseManager: make warnings show even with --quiet

13 years agoUseManager: convert lists to tuples
Zac Medico [Sat, 27 Nov 2010 07:17:49 +0000 (23:17 -0800)]
UseManager: convert lists to tuples

13 years agodepgraph: check unevaluated USE dep IUSE earlier
Zac Medico [Sat, 27 Nov 2010 06:30:19 +0000 (22:30 -0800)]
depgraph: check unevaluated USE dep IUSE earlier

13 years agodepgraph: tweak USE match logic for bug 345979
Zac Medico [Sat, 27 Nov 2010 06:18:05 +0000 (22:18 -0800)]
depgraph: tweak USE match logic for bug 345979

This should fix handling of some corner cases in which use.force
or use.mask might not have been handled correctly, and removes some
redundant IUSE related checks.

13 years agoBump header date stamps on man pages.
Zac Medico [Sat, 27 Nov 2010 04:47:56 +0000 (20:47 -0800)]
Bump header date stamps on man pages.

13 years agowhitelist proxy vars and don't save them
Zac Medico [Fri, 26 Nov 2010 22:04:28 +0000 (14:04 -0800)]
whitelist proxy vars and don't save them

13 years agostack_lists: optimize repo logic
Zac Medico [Fri, 26 Nov 2010 21:46:26 +0000 (13:46 -0800)]
stack_lists: optimize repo logic

13 years agoportdbapi: eliminate redundant treemap lookups
Zac Medico [Fri, 26 Nov 2010 21:09:09 +0000 (13:09 -0800)]
portdbapi: eliminate redundant treemap lookups

13 years agoportdbapi.__init__: always warn for unused param
Zac Medico [Fri, 26 Nov 2010 20:34:13 +0000 (12:34 -0800)]
portdbapi.__init__: always warn for unused param

13 years agoshow_unsatisfied_dep: include ROOT if it's not /
Zac Medico [Fri, 26 Nov 2010 19:54:42 +0000 (11:54 -0800)]
show_unsatisfied_dep: include ROOT if it's not /

13 years agoFix quotes in QA_PREBUILT docs.
Zac Medico [Fri, 26 Nov 2010 19:36:12 +0000 (11:36 -0800)]
Fix quotes in QA_PREBUILT docs.

13 years agoconfig.environ: filter calling env only if mycpv
Zac Medico [Thu, 25 Nov 2010 17:27:19 +0000 (09:27 -0800)]
config.environ: filter calling env only if mycpv

13 years agocreate_trees: propagate proxy vars to host ROOT
Zac Medico [Thu, 25 Nov 2010 08:26:52 +0000 (00:26 -0800)]
create_trees: propagate proxy vars to host ROOT

13 years agofetch: pass full env to fetcher (for proxy vars)
Zac Medico [Thu, 25 Nov 2010 08:23:15 +0000 (00:23 -0800)]
fetch: pass full env to fetcher (for proxy vars)

This should fix bug #315421.

13 years agorepoman: fix broken masking check v2.2.0_alpha5
Zac Medico [Thu, 25 Nov 2010 04:00:17 +0000 (20:00 -0800)]
repoman: fix broken masking check

This has been broken since 9ed6332f2015e41f072f897764f550c5574ea96f.

13 years ago_get_usedep_re: make None eapi imply latest
Zac Medico [Thu, 25 Nov 2010 01:10:47 +0000 (17:10 -0800)]
_get_usedep_re: make None eapi imply latest

13 years agoRevert use.unsatisfiable support for now.
Zac Medico [Wed, 24 Nov 2010 16:36:12 +0000 (08:36 -0800)]
Revert use.unsatisfiable support for now.

The current implementation doesn't provide anything to distinguish
it from use.mask, and it's arguable that another approach such as
an atom syntax extension (for optional dependencies) would be more
appropriate.

This reverts commit 93ee6a847be949e7752c3c052d3eb0619e408b43.

13 years agograb*_package: optimize for non-existent files
Zac Medico [Wed, 24 Nov 2010 16:15:00 +0000 (08:15 -0800)]
grab*_package: optimize for non-existent files

13 years agoaction_sync: preserved leading / in ssh uri
Zac Medico [Wed, 24 Nov 2010 15:48:26 +0000 (07:48 -0800)]
action_sync: preserved leading / in ssh uri

13 years agoemerge: accept 'y' for options that accept 'n'
Zac Medico [Wed, 24 Nov 2010 01:16:03 +0000 (17:16 -0800)]
emerge: accept 'y' for options that accept 'n'

This will fix bug #346349 and bug #344799.

13 years agorepoman: enable dep check with empty KEYWORDS
Zac Medico [Tue, 23 Nov 2010 01:22:04 +0000 (17:22 -0800)]
repoman: enable dep check with empty KEYWORDS

Since no KEYWORDS are set, and those are normally used to decide
which profiles to check, we use an empty profile with effective
ACCEPT_KEYWORDS set to **.

13 years agoAdd example use.mask usage.
Zac Medico [Mon, 22 Nov 2010 04:51:35 +0000 (20:51 -0800)]
Add example use.mask usage.

13 years agoruntests.sh: handle SIGINT
Zac Medico [Sun, 21 Nov 2010 03:22:33 +0000 (19:22 -0800)]
runtests.sh: handle SIGINT

13 years agoUse Package.use.force/mask attributes.
Zac Medico [Sun, 21 Nov 2010 03:17:49 +0000 (19:17 -0800)]
Use Package.use.force/mask attributes.

13 years agoUse Package.use.force/mask attributes.
Zac Medico [Sun, 21 Nov 2010 03:05:10 +0000 (19:05 -0800)]
Use Package.use.force/mask attributes.

This optimizes the fix for bug #345979.

13 years agoAdd Package.use.force/mask attributes.
Zac Medico [Sun, 21 Nov 2010 03:01:59 +0000 (19:01 -0800)]
Add Package.use.force/mask attributes.

13 years ago_get_use*: remove unused code
Zac Medico [Sat, 20 Nov 2010 17:25:54 +0000 (09:25 -0800)]
_get_use*: remove unused code

13 years agoFix use.mask set intersection from previous.
Zac Medico [Sat, 20 Nov 2010 17:08:17 +0000 (09:08 -0800)]
Fix use.mask set intersection from previous.

13 years agoFix interaction of use.mask/force with use deps.
Zac Medico [Sat, 20 Nov 2010 16:58:28 +0000 (08:58 -0800)]
Fix interaction of use.mask/force with use deps.

This should fix the package selection issue bug #345979 which
triggers invalid "masked by: [nothing]" messages.

14 years agoHandle combination of incremental + USE_EXPAND
Zac Medico [Fri, 19 Nov 2010 23:21:53 +0000 (15:21 -0800)]
Handle combination of incremental + USE_EXPAND

This fixes a corner case in the code from the previous commit.