[Aptitude-svn-commit] r3596 - in branches/aptitude-0.3/aptitude: . src

[Daniel Burrows]

Author: dburrows
Date: Sun Jul  3 18:40:37 2005
New Revision: 3596

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/main.cc
Log:
Don't complain loudly and annoyingly about invalid encodings.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Jul  3 18:40:37 2005
@@ -1,5 +1,10 @@
 2005-07-03  Daniel Burrows  <dburrows@debian.org>
 
+	* src/main.cc:
+
+	  Don't complain loudly about invalid encodings; just generate
+	  output with the offending characters replaced by '?'.
+
 	* src/vscreen/vs_pager.cc:
 
 	  Actually support wide characters in the pager: calculate

Modified: branches/aptitude-0.3/aptitude/src/main.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/main.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/main.cc	Sun Jul  3 18:40:37 2005
@@ -65,6 +65,12 @@
 #include "pkg_grouppolicy.h"
 #include "pkg_view.h"
 
+#if 0
+// These are commented out so as to not punish users unduly for coding
+// errors.  The transcoder now substitutes conspicuous '?' characters
+// into its output, which should be enough of a clue.
+
+
 /** Handles a coding error using the apt error mechanism. */
 std::wstring handle_mbtow_error(int error,
 				const std::wstring &partial,
@@ -83,6 +89,7 @@
 		partial.c_str());
   return partial;
 }
+#endif
 
 static void show_version()
 {
@@ -184,8 +191,10 @@
 {
   srandom(time(0));
 
-  transcode_mbtow_err=handle_mbtow_error;
-  transcode_wtomb_err=handle_wtomb_error;
+  // See earlier note
+  //
+  //transcode_mbtow_err=handle_mbtow_error;
+  //transcode_wtomb_err=handle_wtomb_error;
 
   setlocale(LC_ALL, "");
   bindtextdomain(PACKAGE, LOCALEDIR);