Treat debtags always as strings; unify ept/non-ept interface to debtags

The behaviour of the non-ept interface has been updated
and corrected, so that, for example, the debtags browser
works correctly.

1 files changed, 4 insertions, 13 deletions

diff --git a/src/gtk/gui.cc b/src/gtk/gui.cc
index b1715bb5..e846f6f2 100644
--- a/src/gtk/gui.cc
+++ b/src/gtk/gui.cc
@@ -1272,32 +1272,23 @@ namespace gui
     if(pkg.end())
       return where;
 
-#ifdef HAVE_EPT
     using aptitude::apt::get_fullname;
     using aptitude::apt::get_tags;
     using aptitude::apt::tag;
 
-    const std::set<tag> realS(get_tags(pkg));
-    const std::set<tag> * const s(&realS);
-#else
-    const std::set<tag> * const s(get_tags(pkg));
-#endif
+    const std::set<tag> s(get_tags(pkg));
 
-    if(s != NULL && !s->empty())
+    if(s->empty() == false)
       {
 	bool first = true;
 	where = buffer->insert_with_tag(where,
 					ssprintf(_("Tags of %s:\n"), pkg.Name()),
 					headerTag);
 	// TODO: indent all the tags.
-	for(std::set<tag>::const_iterator it = s->begin();
-	    it != s->end(); ++it)
+	for(std::set<tag>::const_iterator it = s.begin();
+	    it != s.end(); ++it)
 	  {
-#ifdef HAVE_EPT
 	    const std::string name(get_fullname(*it));
-#else
-	    const std::string name(it->str());
-#endif
 
 	    if(first)
 	      first = false;