diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-12-04 22:21:14 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-12-04 22:21:14 +0000 |
| commit | 669eff5e9d39d4987bf73c4f84055a163e7b08e4 (patch) | |
| tree | 0ce96c76514e7cd5c8348511796169450323f26b | |
| parent | 92ea19a9e671d0317699ccabd6ecfff511f6c5a2 (diff) | |
| download | portage-669eff5e9d39d4987bf73c4f84055a163e7b08e4.tar.gz portage-669eff5e9d39d4987bf73c4f84055a163e7b08e4.tar.bz2 portage-669eff5e9d39d4987bf73c4f84055a163e7b08e4.zip | |
Fix up mtimedb["ldpath"] references broken by the previous commit.
svn path=/main/trunk/; revision=5174
| -rwxr-xr-x | bin/emerge | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge index 1c20cc14e..823cbaa2c 100755 --- a/bin/emerge +++ b/bin/emerge @@ -4434,7 +4434,6 @@ def emerge_main(): settings, trees, mtimedb = load_emerge_config(trees=trees) portdb = trees[settings["ROOT"]]["porttree"].dbapi - ldpath_mtimes = mtimedb["ldpath"] xterm_titles = "notitles" not in settings.features """Disable color as early as possible via NOCOLOR and stdout @@ -4698,13 +4697,13 @@ def emerge_main(): validate_ebuild_environment(trees) vartree = trees[settings["ROOT"]]["vartree"] if 1 == unmerge(settings, myopts, vartree, myaction, myfiles, - ldpath_mtimes, raise_on_missing=False): + mtimedb["ldpath"], raise_on_missing=False): if "--pretend" not in myopts: post_emerge(settings, mtimedb, 0) elif "depclean"==myaction: validate_ebuild_environment(trees) - action_depclean(settings, trees, ldpath_mtimes, + action_depclean(settings, trees, mtimedb["ldpath"], myopts, spinner) if "--pretend" not in myopts: post_emerge(settings, mtimedb, 0) |