[paludis-commits] r4591 - in trunk: . doc/configuration paludis paludis/repositories/unpackaged src/clients/importare src/output
dleverton at svn.pioto.org
dleverton at svn.pioto.org
Mon Apr 21 10:09:43 UTC 2008
Author: dleverton
Date: 2008-04-21 10:09:42 +0000 (Mon, 21 Apr 2008)
New Revision: 4591
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/doc/configuration/sets.html.part.in
trunk/paludis/dep_list.cc
trunk/paludis/environment_implementation.cc
trunk/paludis/install_task.cc
trunk/paludis/repositories/unpackaged/installed_repository.cc
trunk/paludis/uninstall_list.cc
trunk/src/clients/importare/command_line.cc
trunk/src/output/console_install_task.cc
Log:
Remove "ununused" set, make importare use the world file as usual, and make the resolver cope with the lack of installable versions.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-04-21 05:31:10 UTC (rev 4590)
+++ trunk/ChangeLog 2008-04-21 10:09:42 UTC (rev 4591)
@@ -5,6 +5,13 @@
only listed in SVN log. For a summary of what has changed between releases,
see the NEWS file. This file is occasionally pruned to ChangeLog.old.bz2.
+2008-04-21 David Leverton
+
+ * doc/configuration/, paludis/, paludis/repositories/unpackaged/,
+ src/clients/importare/, src/output/: Remove "ununused" set, make
+ importare use the world file as usual, and make the resolver cope
+ with the lack of installable versions.
+
2008-04-21 Ciaran McCreesh
* paludis/repositories/e/: Make env->query_use(...) return false for
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-04-21 05:31:10 UTC (rev 4590)
+++ trunk/NEWS 2008-04-21 10:09:42 UTC (rev 4591)
@@ -11,6 +11,11 @@
* env->query_use(...) now issues a QA notice and returns false for E
repository IDs when the flag isn't in IUSE / USE_EXPAND / arch.list.
+ * importare now adds packages to the world file unless the --preserve-world
+ option is specified; any packages previously installed with importare
+ should be added manually if appropriate. The special "ununused" set no
+ longer exists.
+
0.26.0_pre2:
* paludis now supports ${root} in environment.conf. This can be
used when defining the "world" key, so that the configuration
Modified: trunk/doc/configuration/sets.html.part.in
===================================================================
--- trunk/doc/configuration/sets.html.part.in 2008-04-21 05:31:10 UTC (rev 4590)
+++ trunk/doc/configuration/sets.html.part.in 2008-04-21 10:09:42 UTC (rev 4591)
@@ -24,10 +24,6 @@
<dt><code>insecurity</code></dt>
<dd>The set of insecure packages (mostly for internal use).</dd>
-
- <dt><code>ununused</code></dt>
- <dd>Any packages that, although not part of system or world, should none-the-less not be considered unused (again,
- mostly for internal use).</dd>
</dl>
<h2>User Defined Sets</h2>
Modified: trunk/paludis/dep_list.cc
===================================================================
--- trunk/paludis/dep_list.cc 2008-04-21 05:31:10 UTC (rev 4590)
+++ trunk/paludis/dep_list.cc 2008-04-21 10:09:42 UTC (rev 4591)
@@ -454,6 +454,16 @@
break;
}
+ if (! best_visible_candidate && ! already_installed->empty() &&
+ (*already_installed->last())->transient_key() && (*already_installed->last())->transient_key()->value() &&
+ (dl_target_package != d->_imp->opts->target_type || ! d->is_top_level_target(**already_installed->last())))
+ {
+ Log::get_instance()->message("dep_list.no_visible.transient", ll_debug, lc_context) << "No visible packages matching '"
+ << a << "', silently falling back to installed package '" << **already_installed->last() << "' as it is transient";
+ d->add_already_installed_package(*already_installed->last(), a.tag(), a, conditions, destinations);
+ return;
+ }
+
/* are we allowed to override mask reasons? */
if (! best_visible_candidate && d->_imp->opts->override_masks)
{
Modified: trunk/paludis/environment_implementation.cc
===================================================================
--- trunk/paludis/environment_implementation.cc 2008-04-21 05:31:10 UTC (rev 4590)
+++ trunk/paludis/environment_implementation.cc 2008-04-21 10:09:42 UTC (rev 4591)
@@ -100,8 +100,7 @@
tr1::shared_ptr<ConstTreeSequence<SetSpecTree, AllDepSpec> > result;
/* these sets always exist, even if empty */
- if (s.data() == "everything" || s.data() == "system" || s.data() == "world" || s.data() == "security"
- || s.data() == "ununused")
+ if (s.data() == "everything" || s.data() == "system" || s.data() == "world" || s.data() == "security")
{
Log::get_instance()->message("environment_implementation.standard_set", ll_debug, lc_context) << "Set '" << s << "' is a standard set";
result.reset(new ConstTreeSequence<SetSpecTree, AllDepSpec>(tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
Modified: trunk/paludis/install_task.cc
===================================================================
--- trunk/paludis/install_task.cc 2008-04-21 05:31:10 UTC (rev 4590)
+++ trunk/paludis/install_task.cc 2008-04-21 10:09:42 UTC (rev 4591)
@@ -1204,7 +1204,7 @@
InstallTask::world_update_set(const SetName & s)
{
if (s == SetName("world") || s == SetName("system") || s == SetName("security")
- || s == SetName("everything") || s == SetName("insecurity") || s == SetName("ununused"))
+ || s == SetName("everything") || s == SetName("insecurity"))
{
on_update_world_skip(s, "special sets cannot be added to world");
return;
Modified: trunk/paludis/repositories/unpackaged/installed_repository.cc
===================================================================
--- trunk/paludis/repositories/unpackaged/installed_repository.cc 2008-04-21 05:31:10 UTC (rev 4590)
+++ trunk/paludis/repositories/unpackaged/installed_repository.cc 2008-04-21 10:09:42 UTC (rev 4591)
@@ -388,7 +388,7 @@
Context context("When fetching package set '" + stringify(s) + "' from '" +
stringify(name()) + "':");
- if ("ununused" == s.data())
+ if ("everything" == s.data())
{
tr1::shared_ptr<ConstTreeSequence<SetSpecTree, AllDepSpec> > result(new ConstTreeSequence<SetSpecTree, AllDepSpec>(
make_shared_ptr(new AllDepSpec)));
@@ -421,7 +421,6 @@
tr1::shared_ptr<SetNameSet> result(new SetNameSet);
result->insert(SetName("everything"));
- result->insert(SetName("ununused"));
return result;
}
Modified: trunk/paludis/uninstall_list.cc
===================================================================
--- trunk/paludis/uninstall_list.cc 2008-04-21 05:31:10 UTC (rev 4590)
+++ trunk/paludis/uninstall_list.cc 2008-04-21 10:09:42 UTC (rev 4591)
@@ -427,16 +427,13 @@
depped_upon_not_list->begin(), depped_upon_not_list->end(), unused_dependencies->inserter(),
PackageIDSetComparator());
- /* if any of them aren't already on the list, and aren't in world or ununused, add them and recurse */
- tr1::shared_ptr<SetSpecTree::ConstItem> world(_imp->env->set(SetName("world"))),
- ununused(_imp->env->set(SetName("ununused")));
+ /* if any of them aren't already on the list, and aren't in world, add them and recurse */
+ tr1::shared_ptr<SetSpecTree::ConstItem> world(_imp->env->set(SetName("world")));
for (PackageIDSet::ConstIterator i(unused_dependencies->begin()),
i_end(unused_dependencies->end()) ; i != i_end ; ++i)
{
if (match_package_in_set(*_imp->env, *world, **i))
continue;
- if (ununused && match_package_in_set(*_imp->env, *ununused, **i))
- continue;
if (_imp->uninstall_list.end() != std::find_if(_imp->uninstall_list.begin(),
_imp->uninstall_list.end(), MatchUninstallListEntry(*i)))
@@ -508,15 +505,12 @@
tr1::shared_ptr<PackageIDSet> result(new PackageIDSet);
tr1::shared_ptr<const PackageIDSet> everything(collect_all_installed());
- tr1::shared_ptr<SetSpecTree::ConstItem> world(_imp->env->set(SetName("world"))),
- ununused(_imp->env->set(SetName("ununused")));
+ tr1::shared_ptr<SetSpecTree::ConstItem> world(_imp->env->set(SetName("world")));
for (PackageIDSet::ConstIterator i(everything->begin()),
i_end(everything->end()) ; i != i_end ; ++i)
{
if (match_package_in_set(*_imp->env, *world, **i))
result->insert(*i);
- else if (ununused && match_package_in_set(*_imp->env, *ununused, **i))
- result->insert(*i);
}
return result;
Modified: trunk/src/clients/importare/command_line.cc
===================================================================
--- trunk/src/clients/importare/command_line.cc 2008-04-21 05:31:10 UTC (rev 4590)
+++ trunk/src/clients/importare/command_line.cc 2008-04-21 10:09:42 UTC (rev 4591)
@@ -61,8 +61,6 @@
{
add_usage_line("[ --install ] [ --location path/ ] category/package [ version ] [ slot ]");
- install_args.a_preserve_world.remove();
- install_args.a_preserve_world.set_specified(true);
install_args.a_add_to_world_spec.remove();
install_args.a_debug_build.remove();
install_args.a_checks.remove();
Modified: trunk/src/output/console_install_task.cc
===================================================================
--- trunk/src/output/console_install_task.cc 2008-04-21 05:31:10 UTC (rev 4590)
+++ trunk/src/output/console_install_task.cc 2008-04-21 10:09:42 UTC (rev 4591)
@@ -902,8 +902,6 @@
std::string desc;
if (tag.short_text() == "world")
desc = ": Packages that have been explicitly installed";
- else if (tag.short_text() == "ununused")
- desc = ": Packages that have been explicitly marked as not unused";
else if (tag.short_text() == "everything")
desc = ": All installed packages";
else if (tag.short_text() == "system")
More information about the paludis-commits
mailing list