[Debtags-commits] [svn] r1023 - libdebtags1/trunk/debtags

[Enrico Zini]

Author: enrico
Date: Mon Jul 25 17:00:10 2005
New Revision: 1023

Modified:
   libdebtags1/trunk/debtags/DebtagsStatus.h
   libdebtags1/trunk/debtags/PackageDB.h
   libdebtags1/trunk/debtags/Update.cc
Log:
Don't read /usr/share/debtags/vocabulary on update

Modified: libdebtags1/trunk/debtags/DebtagsStatus.h
==============================================================================
--- libdebtags1/trunk/debtags/DebtagsStatus.h	(original)
+++ libdebtags1/trunk/debtags/DebtagsStatus.h	Mon Jul 25 17:00:10 2005
@@ -32,6 +32,8 @@
 class DebtagsStatus
 {
 public:
+	virtual ~DebtagsStatus() {}
+
 	/**
 	 * Update the status
 	 *

Modified: libdebtags1/trunk/debtags/PackageDB.h
==============================================================================
--- libdebtags1/trunk/debtags/PackageDB.h	(original)
+++ libdebtags1/trunk/debtags/PackageDB.h	Mon Jul 25 17:00:10 2005
@@ -51,6 +51,8 @@
 class PkgRecordConsumer
 {
 public:
+	virtual ~PkgRecordConsumer() {}
+
 	virtual void operator()(pkgRecords::Parser&) = 0;
 };
 

Modified: libdebtags1/trunk/debtags/Update.cc
==============================================================================
--- libdebtags1/trunk/debtags/Update.cc	(original)
+++ libdebtags1/trunk/debtags/Update.cc	Mon Jul 25 17:00:10 2005
@@ -44,7 +44,7 @@
 
 static const char* fn_sources = "/etc/debtags/sources.list";
 static const char* path_cache = "/var/cache/debtags";
-static const char* fn_dist_vocab = "/usr/share/debtags/vocabulary";
+//static const char* fn_dist_vocab = "/usr/share/debtags/vocabulary";
 static const char* path_tagvoc_d = "/etc/debtags/tagvoc.d";
 
 //fn_dist_vocab = '$(usr/share/debtags)'/vocabulary
@@ -242,8 +242,10 @@
 
 static void readBasicVocabularies(VocabularyMerger& systemvoc) throw (FileException, ParserException)
 {
+	/*
 	StdioParserInput mainInput(fn_dist_vocab);
 	systemvoc.read(mainInput);
+	*/
 	
 	DIR* dir = opendir(path_tagvoc_d);
 	if (!dir)