Zac Medico [Sun, 6 Dec 2009 08:40:25 +0000 (08:40 -0000)]
Fix _spawn_misc_sh() to properly unset EBUILD_PHASE, and add a 'phase'
description parameter for use in messages.
svn path=/main/trunk/; revision=14934
Zac Medico [Sun, 6 Dec 2009 08:03:46 +0000 (08:03 -0000)]
Add a AbstractEbuildProcess class for MiscFunctionsProcess to inherit the
_pipe and _can_log methods that used to be in the EbuildProcess class.
svn path=/main/trunk/; revision=14933
Zac Medico [Sun, 6 Dec 2009 01:12:45 +0000 (01:12 -0000)]
Make register_die_hook() ensure that each hook is registered only once.
svn path=/main/trunk/; revision=14932
Zac Medico [Sun, 6 Dec 2009 00:35:30 +0000 (00:35 -0000)]
Use portage.StringIO to avoid duplicate import fallback code.
svn path=/main/trunk/; revision=14931
Zac Medico [Sun, 6 Dec 2009 00:25:02 +0000 (00:25 -0000)]
Move code for handling missing sandbox binary out of the config constructor.
svn path=/main/trunk/; revision=14930
Zac Medico [Sat, 5 Dec 2009 23:31:26 +0000 (23:31 -0000)]
Bug #295805 - Fix ValueError with python3 inside update_config_files().
svn path=/main/trunk/; revision=14929
Zac Medico [Sat, 5 Dec 2009 23:00:55 +0000 (23:00 -0000)]
Bug #162404 - Automatically disable logging if sesandbox is enabled and a
pty is not available for some reason (currently they are never available
with python3).
svn path=/main/trunk/; revision=14928
Zac Medico [Sat, 5 Dec 2009 22:00:19 +0000 (22:00 -0000)]
Always append QA Notices resulting from the build log search to the end of
the log. Thanks to Diego E. Pettenò for reporting.
svn path=/main/trunk/; revision=14927
Zac Medico [Thu, 3 Dec 2009 04:48:53 +0000 (04:48 -0000)]
Bug #280336, comment #2 - Clear the package selection cache when packages
are added to the graph. This fixes incorrect choices that happen in some
cases.
svn path=/main/trunk/; revision=14922
Zac Medico [Wed, 2 Dec 2009 06:55:49 +0000 (06:55 -0000)]
Bug #295351 - Make update_dbentries() return unicode if it's given unicode,
and bytes if it's given bytes.
svn path=/main/trunk/; revision=14921
Zac Medico [Sat, 28 Nov 2009 21:28:34 +0000 (21:28 -0000)]
Fix deprecated usage of dep_getkey(). Thanks to Sebastian Mingramm (few)
for reporting.
svn path=/main/trunk/; revision=14915
Zac Medico [Sat, 28 Nov 2009 12:15:43 +0000 (12:15 -0000)]
Bug #294945 - Fix blocker satistfied state handling inside depgraph, to
avoid a KeyError when displaying blockers.
svn path=/main/trunk/; revision=14914
Zac Medico [Sat, 28 Nov 2009 11:53:56 +0000 (11:53 -0000)]
Revert r14901 since it doesn't solve the problem (bug #294945).
svn path=/main/trunk/; revision=14913
Zac Medico [Fri, 27 Nov 2009 23:33:06 +0000 (23:33 -0000)]
In FakeVartree.sync(), skip the aux_get wrapper when populating old-style
virtuals, in order to avoid unwanted cache generation with --nodeps (reported
by Arfrever).
svn path=/main/trunk/; revision=14909
Zac Medico [Fri, 27 Nov 2009 23:01:35 +0000 (23:01 -0000)]
Bug #294886 - Show some basic info at the beginning of the build log,
including USE flags.
svn path=/main/trunk/; revision=14907
Zac Medico [Fri, 27 Nov 2009 22:22:04 +0000 (22:22 -0000)]
Handle a KeyError in depgraph._ordered_tree_display(), reported on irc by
romildo.
svn path=/main/trunk/; revision=14901
Zac Medico [Fri, 27 Nov 2009 22:03:36 +0000 (22:03 -0000)]
Add a note about lack of nanosecond precision in movefile().
svn path=/main/trunk/; revision=14900
Zac Medico [Fri, 27 Nov 2009 02:30:52 +0000 (02:30 -0000)]
In calc_depclean(), load the FakeVartree before using it. This fixes
a regression which causes incomplete graph creation (since r14773).
Thanks to Vlastimil Babka <caster@g.o> for reporting.
svn path=/main/trunk/; revision=14899
Zac Medico [Fri, 27 Nov 2009 02:22:08 +0000 (02:22 -0000)]
Fix logic from previous commit so it only applies when a 'newmtime' parameter
has not been specified (this is always the case when called by portage).
svn path=/main/trunk/; revision=14898
Zac Medico [Thu, 26 Nov 2009 21:59:51 +0000 (21:59 -0000)]
In movefile(), skip os.utime() when os.rename() succeeds, in order to
completely preserve mtime resolution.
svn path=/main/trunk/; revision=14897
Zac Medico [Wed, 25 Nov 2009 22:21:34 +0000 (22:21 -0000)]
Set built=True when creating Package instances. This fixes a problem with
--resume, reported by Sebastian Mingramm (few).
svn path=/main/trunk/; revision=14886
Zac Medico [Wed, 25 Nov 2009 21:59:02 +0000 (21:59 -0000)]
Use einfo instead of ewarn for the "Skipping make test/check due to ebuild
restriction." message.
svn path=/main/trunk/; revision=14885
Zac Medico [Mon, 23 Nov 2009 22:19:43 +0000 (22:19 -0000)]
Add a test case which simply compiles all modules, useful for testing syntax
compatibility with the current version of python.
svn path=/main/trunk/; revision=14876
Zac Medico [Mon, 23 Nov 2009 21:34:51 +0000 (21:34 -0000)]
Bug #293614 - When the backtracking limit is reached and there is a SLOT
conflict to display, hint that a larger --backtrack value might solve
the conflict automatically.
svn path=/main/trunk/; revision=14875
Zac Medico [Sun, 22 Nov 2009 05:16:23 +0000 (05:16 -0000)]
Add "repository" attribute to CategorySet (revert r11597). Thanks to TGL
<tom.gl@free.fr> for this patch, posted on bug #291414.
svn path=/main/trunk/; revision=14874
Zac Medico [Sun, 22 Nov 2009 01:58:05 +0000 (01:58 -0000)]
Bug #293998 - Use OSError.errno instead of trying to subscript the exception
when handling errno.EXDEV in movefile(), since exceptions do not support
subscripting in python3.
svn path=/main/trunk/; revision=14873
Zac Medico [Sat, 21 Nov 2009 02:38:39 +0000 (02:38 -0000)]
Optimized the code for bug #288083 and make it handle more cases. Now Package
instances have 'visible' and 'masks' attributes, since this information needs
to be accessed in more places now.
svn path=/main/trunk/; revision=14859
Zac Medico [Sat, 21 Nov 2009 00:25:48 +0000 (00:25 -0000)]
Tweak logic from previous commit.
svn path=/main/trunk/; revision=14858
Zac Medico [Sat, 21 Nov 2009 00:19:14 +0000 (00:19 -0000)]
In depgraph._serialize_tasks(), ensure that unsolvable blockers can't be
accidentally marked as satisfied.
svn path=/main/trunk/; revision=14857
Zac Medico [Sat, 21 Nov 2009 00:09:13 +0000 (00:09 -0000)]
Fix blocker display to work properly with --tree --unordered-display.
svn path=/main/trunk/; revision=14856
Zac Medico [Fri, 20 Nov 2009 23:32:12 +0000 (23:32 -0000)]
Fix depgraph._prune_tree_display() to preserve uninstall tasks. Thanks to
Jonathan Callen <abcd@g.o> for reporting.
svn path=/main/trunk/; revision=14855
Zac Medico [Fri, 20 Nov 2009 06:07:41 +0000 (06:07 -0000)]
Bug #293730 - Fix bad || choices triggered in some cases inside
_dep_check_composite_db._visible() when --update is not enabled.
svn path=/main/trunk/; revision=14854
Zac Medico [Fri, 20 Nov 2009 05:32:05 +0000 (05:32 -0000)]
Disable backtracking in the depgraph constructor call when appropriate.
svn path=/main/trunk/; revision=14853
Zac Medico [Fri, 20 Nov 2009 04:56:18 +0000 (04:56 -0000)]
Bug #293603 - Blacklist EPREFIX and EROOT variables, in addition to ED.
svn path=/main/trunk/; revision=14852
Zac Medico [Thu, 19 Nov 2009 21:16:26 +0000 (21:16 -0000)]
Bug #293603 - Add $ED to the blacklist, to prevent interference with related
prefix code in eclasses and ebuilds.
svn path=/main/trunk/; revision=14851
Zac Medico [Tue, 17 Nov 2009 02:41:44 +0000 (02:41 -0000)]
Check for updates masked by license for any installed packages that have been
added to the graph (regardless of --deep or --complete-graph)..
svn path=/main/trunk/; revision=14845
Zac Medico [Tue, 17 Nov 2009 02:26:24 +0000 (02:26 -0000)]
Bug #293448 - Fix TypeError when sending mail with python3, triggered by this
issue: http://bugs.python.org/issue6521. Thanks to Albert W. Hopkins
<marduk@python.net> for this patch.
svn path=/main/trunk/; revision=14844
Zac Medico [Mon, 16 Nov 2009 00:23:08 +0000 (00:23 -0000)]
Remove SLOT.missing since SLOT.invalid handles that case now.
svn path=/main/trunk/; revision=14824
Zac Medico [Sun, 15 Nov 2009 23:54:23 +0000 (23:54 -0000)]
In the code from bug #288083, only show one LICENSE masking message per slot.
svn path=/main/trunk/; revision=14823
Zac Medico [Sun, 15 Nov 2009 23:40:00 +0000 (23:40 -0000)]
Bug #288083 - Always warn about installed packages masked by license, since
the user likely wants to adjust ACCEPT_LICENSE. For updates masked by license,
warn if --complete-graph or --deep is given, since otherwise it is likely a
waste of time.
svn path=/main/trunk/; revision=14822
Zac Medico [Sat, 14 Nov 2009 20:33:52 +0000 (20:33 -0000)]
Bug #291200 - Make --quiet-build set PORTAGE_QUIET=1, so that --unmerge is
quiet.
svn path=/main/trunk/; revision=14821
Zac Medico [Fri, 13 Nov 2009 11:00:56 +0000 (11:00 -0000)]
Inside LinkageMap.rebuild(), ensure that all preserved libraries have an
entry in self._obj_properties, even when they fail to appear in scanelf
output. This is important in order to prevent findConsumers from raising
an unwanted KeyError.
svn path=/main/trunk/; revision=14820
Zac Medico [Thu, 12 Nov 2009 23:34:36 +0000 (23:34 -0000)]
Bug #292820 - Make the Package constructor handle invalid SLOT values.
svn path=/main/trunk/; revision=14819
Zac Medico [Thu, 12 Nov 2009 23:17:58 +0000 (23:17 -0000)]
Bug #292910 - Don't mix print() and writemsg_stdout(), in order to avoid
buffering issues.
svn path=/main/trunk/; revision=14818
Zac Medico [Thu, 12 Nov 2009 23:06:20 +0000 (23:06 -0000)]
Implement dblink.__hash__ and __eq__, so that `portageq owners` correctly groups
search results. Also, increase iter_owners dblink cache size from 25 to 100
instances.
svn path=/main/trunk/; revision=14817
Zac Medico [Thu, 12 Nov 2009 02:31:34 +0000 (02:31 -0000)]
Add setup phases to the tail of the merge queue instead of the front, since
otherwise when merging binary packages we sometimes tend to get a large number
of setup phases flooding the queue and preventing queued installs from
running.
svn path=/main/trunk/; revision=14816
Zac Medico [Wed, 11 Nov 2009 22:56:58 +0000 (22:56 -0000)]
Inside iter_owners, only cache a maximum of 25 dblink instances, in order
to avoid potentially running out of memory.
svn path=/main/trunk/; revision=14815
Zac Medico [Wed, 11 Nov 2009 21:56:51 +0000 (21:56 -0000)]
Bug #292664 - Show ACCEPT_LICENSE in emerge --info.
svn path=/main/trunk/; revision=14814
Zac Medico [Wed, 11 Nov 2009 06:50:35 +0000 (06:50 -0000)]
Convert MIMEText body to string before sending.
svn path=/main/trunk/; revision=14808
Zac Medico [Wed, 11 Nov 2009 06:46:12 +0000 (06:46 -0000)]
Preserve previous usage of MIMEText constructor under python2, since it's
known to work this way.
svn path=/main/trunk/; revision=14807
Zac Medico [Wed, 11 Nov 2009 06:38:32 +0000 (06:38 -0000)]
Bug #292528 - Specify UTF-8 in the MIMEText constructor arguments, in order
to avoid conversiont to ascii and subsequent UnicodeEncodeError when sending
mail. The idea comes from here: http://bugs.python.org/issue4403#msg76425.
svn path=/main/trunk/; revision=14806
Zac Medico [Mon, 9 Nov 2009 20:51:20 +0000 (20:51 -0000)]
Bug #278336 - Use adjust_config to set PORTAGE_QUIET when the config is
reloaded after sync, so that PORTAGE_QUIET is set when the post_sync
script is executed.
svn path=/main/trunk/; revision=14805
Arfrever Frehtes Taifersar Arahesis [Sun, 8 Nov 2009 14:30:55 +0000 (14:30 -0000)]
Restore support for bash-3.
svn path=/main/trunk/; revision=14804
Zac Medico [Sat, 7 Nov 2009 21:23:06 +0000 (21:23 -0000)]
Make split-elog bold.
svn path=/main/trunk/; revision=14803
Zac Medico [Sat, 7 Nov 2009 20:54:55 +0000 (20:54 -0000)]
When displaying masking messages, show the 'dependency required by' message
before the masking docs message.
svn path=/main/trunk/; revision=14802
Zac Medico [Sat, 7 Nov 2009 01:18:54 +0000 (01:18 -0000)]
Fix typo in comment.
svn path=/main/trunk/; revision=14798
Zac Medico [Fri, 6 Nov 2009 23:26:32 +0000 (23:26 -0000)]
Use writemsg instead of print, to send debug messages to stderr.
svn path=/main/trunk/; revision=14784
Zac Medico [Fri, 6 Nov 2009 23:14:08 +0000 (23:14 -0000)]
Bug #291200 - Add a --quiet-build option to redirect all build output to logs
alone, and do not display it on stdout.
svn path=/main/trunk/; revision=14783
Zac Medico [Fri, 6 Nov 2009 22:30:24 +0000 (22:30 -0000)]
Collapse two [[ ]] into one.
svn path=/main/trunk/; revision=14782
Zac Medico [Fri, 6 Nov 2009 22:28:44 +0000 (22:28 -0000)]
For --debug mode, enable bash tracing when sourcing the ebuild.
svn path=/main/trunk/; revision=14781
Zac Medico [Fri, 6 Nov 2009 03:52:36 +0000 (03:52 -0000)]
Bug #291142 - Fix some cases when a 'missed update' message might not be
displayed.
svn path=/main/trunk/; revision=14780
Zac Medico [Fri, 6 Nov 2009 02:56:32 +0000 (02:56 -0000)]
Use writemsg instead of print, to send debug messages to stderr.
svn path=/main/trunk/; revision=14779
Arfrever Frehtes Taifersar Arahesis [Thu, 5 Nov 2009 23:13:41 +0000 (23:13 -0000)]
Define portage.proxy.objectproxy.ObjectProxy.__add__() to fix problem with string concatenation reported by dol-sen.
svn path=/main/trunk/; revision=14778
Arfrever Frehtes Taifersar Arahesis [Wed, 4 Nov 2009 21:48:41 +0000 (21:48 -0000)]
Decode git output in _emerge.actions.git_sync_timestamps() for bug #291790.
svn path=/main/trunk/; revision=14777
Zac Medico [Wed, 4 Nov 2009 21:41:40 +0000 (21:41 -0000)]
Bug #291331 - Make send_mail() encode the unicode message as bytes before
passing it to smtplib.SMTP.sendmail(), in order to avoid a UnicodeEncodeError
which SMTP.send() tries to encode the message a plain ascii.
svn path=/main/trunk/; revision=14776
Zac Medico [Wed, 4 Nov 2009 06:45:44 +0000 (06:45 -0000)]
Inside depgraph._complete_graph(), only pull in deps for the relevant root
during remove operations. Thanks to acevery for reporting.
svn path=/main/trunk/; revision=14775
Zac Medico [Mon, 2 Nov 2009 01:45:57 +0000 (01:45 -0000)]
Don't call FakeVartree.sync() redundantly when backtracking.
svn path=/main/trunk/; revision=14774
Zac Medico [Sun, 1 Nov 2009 22:24:23 +0000 (22:24 -0000)]
Move FakeVartree population out of the constructor by calling the sync()
method explicitly. This allows the depgraph constructor avoid populating
the FakeVartree, and delay it until depgraph._load_vdb() is called.
svn path=/main/trunk/; revision=14773
Zac Medico [Sun, 1 Nov 2009 22:11:59 +0000 (22:11 -0000)]
Eliminate duplicate code from the FakeVartree constructor which does the
same thing as FakeVartree.sync().
svn path=/main/trunk/; revision=14772
Zac Medico [Sat, 31 Oct 2009 23:51:22 +0000 (23:51 -0000)]
Fix --backtrack option handling.
svn path=/main/trunk/; revision=14767
Zac Medico [Sat, 31 Oct 2009 23:32:13 +0000 (23:32 -0000)]
Add a --backtrack=COUNT option to control how many times backtracking is
allowed, and reduce the default from 30 to 5.
svn path=/main/trunk/; revision=14763
Zac Medico [Sat, 31 Oct 2009 22:59:35 +0000 (22:59 -0000)]
For compatibility, still exit successfully if there are skipped directories.
We can make it more strict later.
svn path=/main/trunk/; revision=14762
Zac Medico [Sat, 31 Oct 2009 22:37:19 +0000 (22:37 -0000)]
Allow unmerge of packages from the "selected" set when a package set such
as @unavailable is given on the command line. Thanks to Vlastimil Babka
<caster@g.o> for reporting.
svn path=/main/trunk/; revision=14761
Zac Medico [Sat, 31 Oct 2009 20:53:43 +0000 (20:53 -0000)]
Bug #290921 - Always exit unsuccessfully if -r is not specified and a
directory is skipped. This reverts a behavior change from r9484.
svn path=/main/trunk/; revision=14760
Zac Medico [Sat, 31 Oct 2009 19:15:54 +0000 (19:15 -0000)]
Make cacheddir() always behave like EmptyOnError is True, since listdir()
doesn't handle a None return value correctly.
svn path=/main/trunk/; revision=14755
Zac Medico [Sat, 31 Oct 2009 19:08:45 +0000 (19:08 -0000)]
Make dblink.delete() remove empty parent category directories.
svn path=/main/trunk/; revision=14754
Zac Medico [Sat, 31 Oct 2009 18:59:37 +0000 (18:59 -0000)]
Bug #291271 - Make vardbapi._bump_mtime() create category directories when
necessary.
svn path=/main/trunk/; revision=14753
Zac Medico [Sat, 31 Oct 2009 04:04:26 +0000 (04:04 -0000)]
Bug #259697 - Update IUSE.invalid docs for GLEP 56.
svn path=/main/trunk/; revision=14751
Zac Medico [Tue, 27 Oct 2009 22:48:32 +0000 (22:48 -0000)]
Bug #290428 - Update mtime of /var/db/pkg and category subdirectories when
stuff inside is modified, so that consumers can use directory mtimes to
validate caches.
svn path=/main/trunk/; revision=14735
Zac Medico [Mon, 26 Oct 2009 22:26:31 +0000 (22:26 -0000)]
Bug #290625 - Manually encode output to stdout in python3, in order to avoid
potential UnicodeEncodeError exceptions.
svn path=/main/trunk/; revision=14734
Zac Medico [Mon, 26 Oct 2009 21:45:55 +0000 (21:45 -0000)]
Revert the workaround for bug #288863. This will require a dependency on
>=sys-apps/sandbox-2.2.
svn path=/main/trunk/; revision=14733
Zac Medico [Mon, 26 Oct 2009 20:02:30 +0000 (20:02 -0000)]
Add a reference to bug #141118 inside _expand_new_virtuals().
svn path=/main/trunk/; revision=14732
Zac Medico [Mon, 26 Oct 2009 19:36:27 +0000 (19:36 -0000)]
Take the -c option and make it mean --depclean instead of --clean, since
--clean is pretty useless anyway.
svn path=/main/trunk/; revision=14731
Zac Medico [Mon, 26 Oct 2009 05:46:39 +0000 (05:46 -0000)]
Add -R as a shortcut for --depclean. Thanks to Jonathan Callen <abcd@g.o> for
the suggestion.
svn path=/main/trunk/; revision=14730
Zac Medico [Sun, 25 Oct 2009 23:57:44 +0000 (23:57 -0000)]
Add a parsedate() function which emulates rfc822.parsedate(), since python3
doesn't have it.
svn path=/main/trunk/; revision=14729
Zac Medico [Sun, 25 Oct 2009 22:41:27 +0000 (22:41 -0000)]
Use calendar.timegm instead of time.mktime, for correct timezone handling.
svn path=/main/trunk/; revision=14728
Zac Medico [Sun, 25 Oct 2009 20:21:10 +0000 (20:21 -0000)]
Don't set mtime on downloaded metadata.dtd when using python3, since the
rfc822.parsedate() function is not available. Thanks to Arfrever for
reporting.
svn path=/main/trunk/; revision=14725
Fabian Groffen [Sat, 24 Oct 2009 11:19:45 +0000 (11:19 -0000)]
update documentation on _test_openpty_eof and disable openpty on Solaris again (branches/prefix r14721)
svn path=/main/trunk/; revision=14722
Zac Medico [Sat, 24 Oct 2009 06:55:34 +0000 (06:55 -0000)]
Bug #134466 - Add a --ask-enter-invalid option. When used together with the
--ask option, interpret a single "Enter" key press as invalid input. This
helps prevent accidental acceptance of the first choice.
svn path=/main/trunk/; revision=14710
Zac Medico [Sat, 24 Oct 2009 05:12:32 +0000 (05:12 -0000)]
Use urllib.urlopen() instead of portage.fetch() for fetching metadata.dtd.
svn path=/main/trunk/; revision=14709
Zac Medico [Fri, 23 Oct 2009 19:12:14 +0000 (19:12 -0000)]
Add --help output for --unordered-display, and move man page docs from the
actions to the options section.
svn path=/main/trunk/; revision=14708
Zac Medico [Fri, 23 Oct 2009 18:20:34 +0000 (18:20 -0000)]
Use find with -print0 for absolute safety.
svn path=/main/trunk/; revision=14707
Zac Medico [Fri, 23 Oct 2009 18:11:40 +0000 (18:11 -0000)]
Bug #289967 - Update installsources rsync code for >=debugedit-4.4.6-r2.
Thanks to Peter Alfredsen <loki_val@g.o> for this patch.
svn path=/main/trunk/; revision=14706
Zac Medico [Fri, 23 Oct 2009 06:32:38 +0000 (06:32 -0000)]
Factor vdb loading code out of the depgraph constructor, since this procedure
is slow and it generates spinner output, which isn't very nice behavior for
a constructor. Now it's called on-demand by various methods when necessary.
svn path=/main/trunk/; revision=14705
Zac Medico [Fri, 23 Oct 2009 06:28:06 +0000 (06:28 -0000)]
Factor out duplicate "These are the packages that would be merged",
"Calculating dependencies", and spinner cleanup code.
svn path=/main/trunk/; revision=14704
Zac Medico [Fri, 23 Oct 2009 05:19:59 +0000 (05:19 -0000)]
Add a --unordered-display option for use with --tree. This allows the display
to be optimized differently since the merge order is not preserved. Thanks
to Sebastian Mingramm (few) for the initial patch.
svn path=/main/trunk/; revision=14703
Zac Medico [Fri, 23 Oct 2009 04:43:44 +0000 (04:43 -0000)]
Factor the --tree code out of depgraph.display().
svn path=/main/trunk/; revision=14702
Zac Medico [Mon, 19 Oct 2009 19:44:16 +0000 (19:44 -0000)]
Fix license_groups parsing to stack the lists, so license_groups from overlays
extend groups from the main tree instead of overwritting them. Thanks to
Vlastimil Babka <caster@g.o> for reporting.
svn path=/main/trunk/; revision=14696
Zac Medico [Mon, 19 Oct 2009 17:05:47 +0000 (17:05 -0000)]
Remove the docs for the extend, remove, and intersect attributes
that are not supported now.
svn path=/main/trunk/; revision=14695
Mike Frysinger [Mon, 19 Oct 2009 07:38:44 +0000 (07:38 -0000)]
drop IMAGE -- people have had years to catch up
svn path=/main/trunk/; revision=14694