[Debtags-commits] [svn] r1571 - in debtags/trunk: . tools

[Enrico Zini]

Author: enrico
Date: Mon Feb 13 14:49:07 2006
New Revision: 1571

Added:
   debtags/trunk/quicktest   (contents, props changed)
Modified:
   debtags/trunk/   (props changed)
   debtags/trunk/tools/debtags.cc
Log:
 r7296 at viaza:  enrico | 2006-02-13 14:49:06 +0100
 debtags maintainers now works
 added a very simple testing script (requires human evaluation to see if tests succeeded)


Modified: debtags/trunk/tools/debtags.cc
==============================================================================
--- debtags/trunk/tools/debtags.cc	(original)
+++ debtags/trunk/tools/debtags.cc	Mon Feb 13 14:49:07 2006
@@ -1008,17 +1008,21 @@
 
 static void printVocabularyItem(const Facet& tag)
 {
+	string ld = tag.longDescription();
 	cout << "Facet: " << tag.name() << endl;
 	cout << "Description: " << tag.shortDescription() << endl;
-	cout << " " << tag.longDescription() << endl;
-	cout << endl;
+	cout << " " << ld << endl;
+	if (ld[ld.size() - 1] != '\n')
+		cout << endl;
 }
 static void printVocabularyItem(const Tag& tag)
 {
+	string ld = tag.longDescription();
 	cout << "Tag: " << tag.fullname() << endl;
 	cout << "Description: " << tag.shortDescription() << endl;
-	cout << " " << tag.longDescription() << endl;
-	cout << endl;
+	cout << " " << ld << endl;
+	if (ld[ld.size() - 1] != '\n')
+		cout << endl;
 }
 
 #if 0
@@ -1181,7 +1185,7 @@
 		InstallUnexpected installUnexpected;
 
 		CommandlineParserWithCommand opts(APPNAME, "[options] [command] [file1|-] [file2|-]",
-				"Perform various operations on a tagged collection\n\n"
+				"Commandline interface to access and manipulate Debian Package Tags.\n\n"
 				"Commands are:\n"
 				"  update        Updates the package tag database (requires root)\n"
 				"  check <file>	 Check that all the tags in the given tagged collection are present\n"
@@ -1646,6 +1650,8 @@
 					if (!i->valid())
 						continue;
 					entity::Version v = i->candidateVersion();
+					if (!v.valid())
+						continue;
 					maints.consume(v.maintainer(), i->tags());
 				}
 				MaintPrinter printer;