Merge lp:~ds3/ubuntu/oneiric/synaptic/fix-for-63974 into lp:ubuntu/oneiric/synaptic

[Douglas Schneider]

gtk/rgmainwindow.cc was modified to make it so that when a user tries to delete a package that is (likely) essential to the os - bash for example - the warning is now given with the offending packages name. This makes it easy for a user to know which packages they should not be deleting if they try to delete many packages at the same time and some are essential.

[Colin Watson (cjwatson)]

Thanks for your patch.

This will break translations. You can't assemble strings at run-time like this and have the result be translatable (because different languages will need to assemble the string in different orders); what you need to do instead is translate a format string and then substitute the package name into that. Awkwardly, RUserDialog::confirm only takes a single string rather than a format string plus arguments, and that looks like a pain to change, but you can just substitute it manually.

Annoyingly, vanilla C++ lacks a way to deal with format strings, aside from the C sprintf/snprintf functions which require deciding on a maximum size for the translated string (even if you dodge buffer overflow issues). I would suggest '#define _GNU_SOURCE 1' at the top of the file and then you can use asprintf. The result would then look something like this (untested):

  char *warning_fmt = _("Removing the %s package may render the "
                        "system usable.\n"
                        "Are you sure you want to do that?")
  char *warning;

  if (asprintf(&warning, warning_fmt, pkg->name()) < 0) {
     perror("asprintf");
     return;
  }
  bool confirmed = _userDialog->confirm(warning, false);
  free(warning);
  if (!confirmed)
     return;

(Not very C++ish, but hopefully Michael will have a look at this at some point and see if he can suggest anything neater!)

review: Needs Fixing

[lp:~ds3/ubuntu/oneiric/synaptic/fix-for-63974]

115. By Douglas Schneider on 2011-12-22

Updated the warning for deleting a required package to use memory allocation.
(LP: #63974)

[Douglas Schneider (ds3)]

The translations need to be updated for the new warning message on line 1887 of gtk/rgmainwindow.cc.

Unmerged revisions

115. By Douglas Schneider on 2011-12-22

Updated the warning for deleting a required package to use memory allocation.
(LP: #63974)

114. By Douglas Schneider on 2011-09-05

updated the change log

113. By Douglas Schneider on 2011-09-04

changed the warning message for deleting an important package to supply the packages name

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-05 21:37:39 +0000
+++ debian/changelog	2011-12-22 18:18:25 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 synaptic (0.75.2ubuntu8) oneiric; urgency=low
 
   * debian/source_synaptic.py: add in an apport package hook (LP: #863792)
@@ -18,6 +19,15 @@
 
  -- Michael Terry <[e-mail]>  Mon, 26 Sep 2011 12:13:46 -0400
 
+=======
+synaptic (0.75.2ubuntu7) oneiric; urgency=low
+
+  * Changed the warning message when about to delete an important package
+    to give the name of the offending package. (LP: #63974)
+
+ -- Doug Schneider <[e-mail]>  Sun, 04 Sep 2011 21:08:18 -0600
+
+>>>>>>> MERGE-SOURCE
 synaptic (0.75.2ubuntu6) oneiric; urgency=low
 
   * Fix missing policy file (again!) (LP: #828315)

=== modified file 'gtk/rgmainwindow.cc'
--- gtk/rgmainwindow.cc	2011-03-04 12:29:46 +0000
+++ gtk/rgmainwindow.cc	2011-12-22 18:18:25 +0000
@@ -37,6 +37,7 @@
 #include <fstream>
 #include <sstream>
 #include <time.h>
+#include <string.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -85,6 +86,9 @@
 // include it here because depcache.h hates us if we have it before
 #include <gdk/gdkx.h>
 
+// define this to get access to asprintf
+#define _GNU_SOURCE 1
+
 
 enum { WHAT_IT_DEPENDS_ON,
    WHAT_DEPENDS_ON_IT,
@@ -1880,12 +1884,20 @@
 void RGMainWindow::pkgRemoveHelper(RPackage *pkg, bool purge, bool withDeps)
 {
    if (pkg->getFlags() & RPackage::FImportant) {
-      if (!_userDialog->confirm(_("Removing this package may render the "
-                                  "system unusable.\n"
-                                  "Are you sure you want to do that?"),
-				false)) {
+      char *warning_fmt = _( "Removing the %s package may render the "
+                             "system unusable.\n"
+                             "Are you sure you want to do that?");
+
+      char *warning;
+      if(asprintf(&warning, warning_fmt, pkg->name()) < 0) {
+         perror("asprintf");
          return;
       }
+
+      bool confirmed = _userDialog->confirm(warning, false);
+      free(warning);
+      if (!confirmed)
+         return;
    }
    if (!withDeps)
       pkg->setRemove(purge);