[Aptitude-devel] Bug#701243: add patch

[Daniel Hartwig]

Control: tags -1 + pending

On 26 February 2013 20:43, Matthias Klose <doko at ubuntu.com> wrote:
> tags 701243 + patch
> thanks
>
> patch at
> http://launchpadlibrarian.net/132378876/aptitude_0.6.8.1-2ubuntu1_0.6.8.1-2ubuntu2.diff.gz

Thanks for the quick patch.  I have adapted the part as ‘task_list’ is
no longer used in other files:

--
diff --git a/src/generic/apt/tasks.h b/src/generic/apt/tasks.h
index d89fa49..5f24ba7 100644
--- a/src/generic/apt/tasks.h
+++ b/src/generic/apt/tasks.h
@@ -63,9 +63,6 @@ public:
   int relevance;
 };

-// Stores the various tasks.
-extern std::map<std::string, task> *task_list;
-
 task *find_task(const std::string &name);

 /** \brief Get the set of tasks associated with the given package.
diff --git a/src/pkg_grouppolicy.cc b/src/pkg_grouppolicy.cc
index 97875c0..5537073 100644
--- a/src/pkg_grouppolicy.cc
+++ b/src/pkg_grouppolicy.cc
@@ -1096,8 +1096,6 @@ public:
 void pkg_grouppolicy_task::add_package(const pkgCache::PkgIterator &pkg,
 				       pkg_subtree *root)
 {
-  using aptitude::apt::task_list;
-
   set<string> *tasks = aptitude::apt::get_tasks(pkg);

   eassert(tasks);
--

Only some boost errors remain [1], which boost upstream seems aware of
and fixing [2].

[1] <http://bugs.debian.org/701377>
[2] <https://svn.boost.org/trac/boost/ticket/7242>