[Debtags-commits] [svn] r1097 - in debtags/trunk: . debian debtags

[Enrico Zini]

Author: enrico
Date: Fri Aug  5 16:34:04 2005
New Revision: 1097

Modified:
   debtags/trunk/README
   debtags/trunk/debian/changelog
   debtags/trunk/debtags/Update.cc
Log:
Merged changes that happened in libdebtags1

Modified: debtags/trunk/README
==============================================================================
--- debtags/trunk/README	(original)
+++ debtags/trunk/README	Fri Aug  5 16:34:04 2005
@@ -104,6 +104,9 @@
  + Merged debtags and libdebtags1 source packages
    Big thanks to Benjamin Mesing for doing a good deal of the work.
 
+--- Done in libdebtags1 version 1.0.8
+ + Also ignore /etc/tagvoc.d
+
 --- Done in 1.2.1
  + Recompiled with new library to fix 'update' feature
  + New bash-completion from Emanuele

Modified: debtags/trunk/debian/changelog
==============================================================================
--- debtags/trunk/debian/changelog	(original)
+++ debtags/trunk/debian/changelog	Fri Aug  5 16:34:04 2005
@@ -13,6 +13,12 @@
 
  -- Enrico Zini <enrico at debian.org>  Wed,  3 Aug 2005 23:25:41 +0200
 
+libdebtags1 (1.0.8) unstable; urgency=low
+
+  * Ignore reading /etc/tagvoc.d on update.
+
+ -- Enrico Zini <enrico at debian.org>  Wed,  3 Aug 2005 23:21:07 +0200
+
 debtags (1.2) unstable; urgency=low
 
   * Updated bash-completion
@@ -46,7 +52,7 @@
     libapt's default, to have more chances to be in the same partition.
     Closes: #319126.
 
- -- Enrico Zini <enrico at debian.org>  Sun, 31 Jul 2005 03:17:43 +0200
+ -- Enrico Zini <enrico at debian.org>  Wed,  3 Aug 2005 23:21:05 +0200
 
 libdebtags1 (1.0.6) unstable; urgency=low
 

Modified: debtags/trunk/debtags/Update.cc
==============================================================================
--- debtags/trunk/debtags/Update.cc	(original)
+++ debtags/trunk/debtags/Update.cc	Fri Aug  5 16:34:04 2005
@@ -63,25 +63,25 @@
 	VocabularyMerger& voc;
 	
 public:
-	VocabularyFilter(VocabularyMerger& voc) throw () : voc(voc) {}
+	VocabularyFilter(VocabularyMerger& voc) : voc(voc) {}
 
-	virtual void consume(const std::string& item) throw ();
-	virtual void consume(const std::string& item, const OpSet<std::string>& tags) throw ();
-	virtual void consume(const OpSet<string>& items) throw ();
-	virtual void consume(const OpSet<string>& items, const OpSet<string>& tags) throw ();
+	virtual void consume(const std::string& item);
+	virtual void consume(const std::string& item, const OpSet<std::string>& tags);
+	virtual void consume(const OpSet<string>& items);
+	virtual void consume(const OpSet<string>& items, const OpSet<string>& tags);
 };
 
-void VocabularyFilter::consume(const string& item) throw ()
+void VocabularyFilter::consume(const string& item)
 {
 	consumer->consume(item);
 }
-void VocabularyFilter::consume(const OpSet<string>& items) throw ()
+void VocabularyFilter::consume(const OpSet<string>& items)
 {
 	consumer->consume(items);
 }
 
 
-void VocabularyFilter::consume(const string& item, const OpSet<string>& tags) throw ()
+void VocabularyFilter::consume(const string& item, const OpSet<string>& tags)
 {
 	OpSet<string> patched;
 	for (OpSet<string>::const_iterator i = tags.begin();
@@ -98,7 +98,7 @@
 }
 
 // Process a set of items identically tagged, with their tags
-void VocabularyFilter::consume(const OpSet<string>& items, const OpSet<string>& tags) throw ()
+void VocabularyFilter::consume(const OpSet<string>& items, const OpSet<string>& tags)
 {
 	OpSet<string> patched;
 	for (OpSet<string>::const_iterator i = tags.begin();
@@ -133,22 +133,22 @@
 protected:
 	PackageDB packageDB;
 public:
-	APTFilter() throw (PackageDBException) {}
-	virtual ~APTFilter() throw () {}
-	virtual void consume(const std::string& item) throw ();
-	virtual void consume(const std::string& item, const OpSet<std::string>& tags) throw ();
-	virtual void consume(const OpSet<string>& items) throw ();
-	virtual void consume(const OpSet<string>& items, const OpSet<string>& tags) throw ();
+	APTFilter() {}
+	virtual ~APTFilter() {}
+	virtual void consume(const std::string& item);
+	virtual void consume(const std::string& item, const OpSet<std::string>& tags);
+	virtual void consume(const OpSet<string>& items);
+	virtual void consume(const OpSet<string>& items, const OpSet<string>& tags);
 };
 
-void APTFilter::consume(const string& item) throw ()
+void APTFilter::consume(const string& item)
 {
 	if (packageDB.hasPackage(item))
 		consumer->consume(item);
 //	else
 //		fprintf(stderr, "Removing package %.*s not found in APT database\n", PFSTR(item));
 }
-void APTFilter::consume(const OpSet<string>& items) throw ()
+void APTFilter::consume(const OpSet<string>& items)
 {
 	OpSet<string> filtered;
 	for (OpSet<string>::const_iterator i = items.begin();
@@ -161,7 +161,7 @@
 }
 
 
-void APTFilter::consume(const string& item, const OpSet<string>& tags) throw ()
+void APTFilter::consume(const string& item, const OpSet<string>& tags)
 {
 	if (packageDB.hasPackage(item))
 		consumer->consume(item, tags);
@@ -170,7 +170,7 @@
 }
 
 // Process a set of items identically tagged, with their tags
-void APTFilter::consume(const OpSet<string>& items, const OpSet<string>& tags) throw ()
+void APTFilter::consume(const OpSet<string>& items, const OpSet<string>& tags)
 {
 	OpSet<string> filtered;
 	for (OpSet<string>::const_iterator i = items.begin();
@@ -193,7 +193,7 @@
 
 	type_t type;
 	string uri;
-	source(type_t type, const std::string& uri) throw () : type(type), uri(uri) {}
+	source(type_t type, const std::string& uri) : type(type), uri(uri) {}
 };
 
 static void zreadCollection(const std::string& local, Debtags::VocabularyMerger& voc, InputMerger<string, string>& merger)
@@ -267,7 +267,7 @@
 	closedir(dir);
 }
 
-static vector<source> readSources() throw (FileException)
+static vector<source> readSources()
     // TODO: remove in favor of apt-pkg sources.list parser?
 {
 	FILE* in = fopen(fn_sources, "rt");