* dselect/install:

  - modernize if-statements not to use 'x' (Closes: #577117)
    Thanks to Jari Aalto for spotting & patching!

diff --git a/debian/changelog b/debian/changelog
index d1068b64d1e96dda988a69030fece995db9a0630..712437a6d3a255549d382e899566c17fcde497f3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 apt (0.7.26~exp4) experimental; urgency=low
 
+  [ David Kalnischkies ]
   * apt-pkg/depcache.cc:
     - "reinstall" the correct version for a killed pseudo package
   * apt-pkg/packagemanager.cc:
@@ -18,12 +19,17 @@ apt (0.7.26~exp4) experimental; urgency=low
     - display MD5Sum in --print-uris if not forced to use another method
       instead of displaying the strongest available (Closes: #576420)
     - regex for package names executed on Grp- not PkgIterator
-    - replace backticks with single quote in broken packages message.
-      Thanks to Jari Aalto for spotting & patching! (Closes: #577168)
   * apt-pkg/deb/dpkgpm.cc:
     - remove Chroot-Directory from files passed to install commands.
       Thanks to Kel Modderman for report & patch! (Closes: #577226)
 
+  [ Jari Aalto ]
+  * cmdline/apt-get.cc:
+    - replace backticks with single quotes around fix-broken command
+      in the broken packages message. (Closes: #577168)
+  * dselect/install:
+    - modernize if-statements not to use 'x' (Closes: #577117)
+
  -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 03 Apr 2010 14:58:39 +0200
 
 apt (0.7.26~exp3) experimental; urgency=low

diff --git a/dselect/install b/dselect/install
index 6779698e0ab817591a6aa1f4c20b6642e008e33d..109307f4de94b513f3f006ace46ed0f27c3f5f39 100755 (executable)
--- a/dselect/install
+++ b/dselect/install
@@ -46,7 +46,7 @@ yesno() {
        echo $ans | tr YN yn
 }
 
-if [ x$WAIT = "xtrue" ]; then
+if [ "$WAIT" = "true" ]; then
    $APTGET $OPTS "$APT_OPT0" "$APT_OPT1" -d dselect-upgrade
    echo $"Press enter to continue." && read RES
    $APTGET $OPTS "$APT_OPT0" "$APT_OPT1" dselect-upgrade
@@ -70,8 +70,8 @@ if [ $RES -eq 0 ]; then
    fi
 
    NEWLS=`ls -ld $ARCHIVES`
-   if [ x$CHECKDIR = "xtrue" ]; then
-      if [ "x$OLDLS" = "x$NEWLS" ]; then
+   if [ "$CHECKDIR" = "true" ]; then
+      if [ "$OLDLS" = "$NEWLS" ]; then
          exit 0
       fi
    fi