summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-04-21 15:16:13 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-04-21 15:16:13 +0200
commitd9319cee6ff10b42e64145c82dfb246a1b3e551c (patch)
tree1dcf031f1409d0f48a27aea380ecad42117664b1
parentb564740226100331f1aba8a1e35a57e5483361f7 (diff)
* dselect/install:
- modernize if-statements not to use 'x' (Closes: #577117) Thanks to Jari Aalto for spotting & patching!
-rw-r--r--debian/changelog10
-rwxr-xr-xdselect/install6
2 files changed, 11 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index d1068b64d..712437a6d 100644
--- 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 6779698e0..109307f4d 100755
--- 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