From: Dennis Groenen <tj.groenen@gmail.com>
Date: Thu, 25 Oct 2012 17:34:25 +0000 (+0200)
Subject: modify warning messages, avoid user confusion on Harmattan
X-Git-Tag: 1.20.2power4~1
X-Git-Url: http://vcs.maemo.org/git/?p=busybox-power;a=commitdiff_plain;h=dcccd69363e4d8306292b9201f52aabad7d62931

modify warning messages, avoid user confusion on Harmattan

A lot of possible warnings during uninstallation are the result of (SHA1)
checksum mismatches. These have nothing to do with Harmattan's platform
security, which also happens to use SHA1 checksums for the very same purpose.
This could confuse users who have more advanced knowledge about Harmattan's
security internals.
Furthermore, it's irrelevant to the user how exactly busybox-power performs its
integrity checks.
---

diff --git a/debian/busybox-power.prerm b/debian/busybox-power.prerm
index 8c69008..66c3c34 100644
--- a/debian/busybox-power.prerm
+++ b/debian/busybox-power.prerm
@@ -50,17 +50,17 @@ CHECK_BACKUP() {
           if test "`cat $INSTALLDIR/busybox.distrib.version`" == "`GETBBVERSION`"; then
             # The backup has been changed whilst busybox hasn't been upgraded
             echo -e "Warning: the backup of the original BusyBox binary has" \
-              "been modified since installing busybox-power (invalid SHA1" \
-              "checksum). Do not continue unless you're sure that $DISTBIN" \
-              "is not corrupted.\n" >> /tmp/busybox-power-error
+              "been modified since installing busybox-power. Do not continue" \
+              "unless you're sure that $DISTBIN is not corrupted.\n" \
+              >> /tmp/busybox-power-error
           fi
         else
           echo -e "Warning: the backup of the original BusyBox binary has" \
-          "been modified since installing busybox-power (invalid SHA1" \
-          "checksum). We could not determine whether this is due to a BusyBox" \
-          "upgrade (e.g. by an (C)SSU update) or not. Do not continue unless" \
-          "either the latter is the case, or you're via other ways sure that" \
-          "$DISTBIN is not corrupted.\n" >> /tmp/busybox-power-error
+          "been modified since installing busybox-power. We could not" \
+          "determine whether this is due to a BusyBox upgrade (e.g. by an" \
+          "(C)SSU update) or not. Do not continue unless either the latter is" \
+          "the case, or you're via other ways sure that $DISTBIN is not" \
+          "corrupted.\n" >> /tmp/busybox-power-error
         fi
       fi
     else
@@ -86,15 +86,15 @@ CHECK_INSTALLEDBIN() {
           fi
         fi
         echo -e "Warning: /bin/busybox has been modified since installing" \
-          "busybox-power (invalid SHA1 checksum). This can be the result of a" \
-          "BusyBox upgrade (e.g. by a Meego update). Your current" \
-          "/bin/busybox won't be touched. Our backup of the original BusyBox" \
-          "binary will be left at $DISTBIN.\n" >> /tmp/busybox-power-error
+          "busybox-power. This can be the result of a BusyBox upgrade (e.g." \
+          "by a Meego update). Your current /bin/busybox won't be touched." \
+          "Our backup of the original BusyBox binary will be left at" \
+          "$DISTBIN.\n" >> /tmp/busybox-power-error
       else
         echo -e "Warning: /bin/busybox has been modified since installing" \
-          "busybox-power (invalid SHA1 checksum). Your current /bin/busybox" \
-          "won't be touched and the diversion of /bin/busybox to $DISTBIN" \
-          "will not be removed.\n" >> /tmp/busybox-power-error
+          "busybox-power. Your current /bin/busybox won't be touched and the" \
+          "diversion of /bin/busybox to $DISTBIN will not be removed.\n" \
+          >> /tmp/busybox-power-error
       fi
     fi
 }