[Debtags-commits] [svn] r1993 - in debtags/1.6.0: . debian tools

[Enrico Zini]

Author: enrico
Date: Wed Oct  4 17:48:37 2006
New Revision: 1993

Modified:
   debtags/1.6.0/   (props changed)
   debtags/1.6.0/configure.ac
   debtags/1.6.0/debian/changelog
   debtags/1.6.0/tools/DebtagsOptions.h
   debtags/1.6.0/tools/debtags.cc
Log:
 r3487 at viaza:  enrico | 2006-10-04 19:48:30 +0200
 Implemented debtags update --reindex


Modified: debtags/1.6.0/configure.ac
==============================================================================
--- debtags/1.6.0/configure.ac	(original)
+++ debtags/1.6.0/configure.ac	Wed Oct  4 17:48:37 2006
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(debtags, 1.6, [enrico at debian.org])
+AC_INIT(debtags, 1.6.1, [enrico at debian.org])
 AC_CONFIG_SRCDIR([configure.ac])
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([foreign])

Modified: debtags/1.6.0/debian/changelog
==============================================================================
--- debtags/1.6.0/debian/changelog	(original)
+++ debtags/1.6.0/debian/changelog	Wed Oct  4 17:48:37 2006
@@ -1,3 +1,9 @@
+debtags (1.6.1) unstable; urgency=low
+
+  * Added --reindex option to update
+
+ -- Enrico Zini <enrico at debian.org>  Wed,  4 Oct 2006 17:50:57 +0200
+
 debtags (1.6.0) unstable; urgency=low
 
   * Redesign with new libept.

Modified: debtags/1.6.0/tools/DebtagsOptions.h
==============================================================================
--- debtags/1.6.0/tools/DebtagsOptions.h	(original)
+++ debtags/1.6.0/tools/DebtagsOptions.h	Wed Oct  4 17:48:37 2006
@@ -41,6 +41,7 @@
 	BoolOption* match_invert;
 
 	BoolOption* misc_local;
+	BoolOption* misc_reindex;
 	IntOption* misc_distance;
 	StringOption* misc_vocfile;
 
@@ -113,6 +114,8 @@
 			"It needs to be run as root");
 		misc_local = update->add<BoolOption>("local", 0, "local",
 			"do not download files when performing an update");
+		misc_reindex = update->add<BoolOption>("reindex", 0, "reindex",
+			"do not download any file, just do reindexing if needed");
 
 		selfcheck = addEngine("selfcheck", "",
 			"perform a series of internal self checks using the current tag data");

Modified: debtags/1.6.0/tools/debtags.cc
==============================================================================
--- debtags/1.6.0/tools/debtags.cc	(original)
+++ debtags/1.6.0/tools/debtags.cc	Wed Oct  4 17:48:37 2006
@@ -1607,17 +1607,20 @@
 			verbose("System source directory: %s\n", ept::Path::debtagsSourceDir().c_str());
 			verbose("User source directory: %s\n", ept::Path::debtagsUserSourceDir().c_str());
 
-			// Run the fetcher to acquire new data
-			string fetcher = SCRIPTDIR "/fetch";
-			if (!fs::access(fetcher, X_OK))
-				warning("Fetch script %s does not exist or is not executable: skipping acquiring of new data\n", fetcher.c_str());
-			else {
-				if (opts.out_verbose->boolValue())
-					fetcher += " --verbose";
-				if (opts.misc_local->boolValue())
-					fetcher += " --local";
-				if (system(fetcher.c_str()) != 0)
-					throw wibble::exception::Consistency("acquiring new data", "fetcher command " + fetcher + " failed");
+			if (!opts.misc_reindex->boolValue())
+			{
+				// Run the fetcher to acquire new data
+				string fetcher = SCRIPTDIR "/fetch";
+				if (!fs::access(fetcher, X_OK))
+					warning("Fetch script %s does not exist or is not executable: skipping acquiring of new data\n", fetcher.c_str());
+				else {
+					if (opts.out_verbose->boolValue())
+						fetcher += " --verbose";
+					if (opts.misc_local->boolValue())
+						fetcher += " --local";
+					if (system(fetcher.c_str()) != 0)
+						throw wibble::exception::Consistency("acquiring new data", "fetcher command " + fetcher + " failed");
+				}
 			}