Import Debian version 0.6

apt-update (0.6) stable; urgency=low

  * Check for warnings from apt during the apt-get update phase

diff --git a/apt-update b/apt-update
index 3f20b04..1b80266 100755 (executable)
--- a/apt-update
+++ b/apt-update
@@ -13,6 +13,8 @@ unset LANGUAGE
 unset LANG
 unset LC_ALL
 
 unset LANG
 unset LC_ALL
 

+TMPFILE=/etc/apt/update.tmp
+

 . /etc/apt/update.conf
 
 if [ "$MAILTO"x = ""x ] ; then
 . /etc/apt/update.conf
 
 if [ "$MAILTO"x = ""x ] ; then


@@ -26,12 +28,19 @@ do
   else
       CHR="chroot $CHROOT"
   fi
   else
       CHR="chroot $CHROOT"
   fi

-  $CHR apt-get update >/dev/null
+  $CHR apt-get update > $TMPFILE 2>&1

   error=$?
   if [ $error -ne 0 ] ; then
       echo $CHR update failed with error $error
       echo
   fi
   error=$?
   if [ $error -ne 0 ] ; then
       echo $CHR update failed with error $error
       echo
   fi

+  # And also check for warnings:
+  grep -q ^W $TMPFILE
+  if [ $? -eq 0 ] ; then
+      echo "$CHR update gave the following warnings:"
+      grep ^W $TMPFILE
+  fi
+  rm -f $TMPFILE

 
   THIS_LIST=`$CHR apt-get -s -u upgrade | awk '/^Inst/ {print $2}'`
   if [ "$THIS_LIST"x != ""x ] ; then
 
   THIS_LIST=`$CHR apt-get -s -u upgrade | awk '/^Inst/ {print $2}'`
   if [ "$THIS_LIST"x != ""x ] ; then

diff --git a/debian/changelog b/debian/changelog
index 82e3b8f..45dfdef 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apt-update (0.6) stable; urgency=low
+
+  * Check for warnings from apt during the apt-get update phase
+       
+ -- Steve McIntyre <steve@einval.com>  Sat, 11 Aug 2007 10:10:41 +0100
+

 apt-update (0.5) stable; urgency=low
 
   * Clean up the LC_* environment better
 apt-update (0.5) stable; urgency=low
 
   * Clean up the LC_* environment better

diff --git a/debian/tmp/DEBIAN/control b/debian/tmp/DEBIAN/control
index 9c0b6ac..0f4d1ee 100644 (file)
--- a/debian/tmp/DEBIAN/control
+++ b/debian/tmp/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: apt-update
 Package: apt-update

-Version: 0.5
+Version: 0.6

 Section: base
 Priority: standard
 Architecture: all
 Section: base
 Priority: standard
 Architecture: all

diff --git a/debian/tmp/DEBIAN/md5sums b/debian/tmp/DEBIAN/md5sums
index a435eb2..fdb3bef 100644 (file)
--- a/debian/tmp/DEBIAN/md5sums
+++ b/debian/tmp/DEBIAN/md5sums
@@ -1,3 +1,3 @@
 d890efb3264a5a274185afaac973e251  usr/sbin/apt-dist-upgrade
 ecba137529ebdecd0e9196e88a6ba3aa  usr/share/doc/apt-update/copyright
 d890efb3264a5a274185afaac973e251  usr/sbin/apt-dist-upgrade
 ecba137529ebdecd0e9196e88a6ba3aa  usr/share/doc/apt-update/copyright

-2c7c525469b52c9fbd532e0c83a5b3f2  usr/share/doc/apt-update/changelog.gz
+27e6c2ee24529b2ae8574a4e8d6e7b00  usr/share/doc/apt-update/changelog.gz

diff --git a/debian/tmp/etc/cron.daily/apt-update b/debian/tmp/etc/cron.daily/apt-update
index 3f20b04..5c93351 100755 (executable)
--- a/debian/tmp/etc/cron.daily/apt-update
+++ b/debian/tmp/etc/cron.daily/apt-update
@@ -13,6 +13,8 @@ unset LANGUAGE
 unset LANG
 unset LC_ALL
 
 unset LANG
 unset LC_ALL
 

+TMPFILE=/etc/apt/update.tmp
+

 . /etc/apt/update.conf
 
 if [ "$MAILTO"x = ""x ] ; then
 . /etc/apt/update.conf
 
 if [ "$MAILTO"x = ""x ] ; then


@@ -32,6 +34,13 @@ do
       echo $CHR update failed with error $error
       echo
   fi
       echo $CHR update failed with error $error
       echo
   fi

+  # And also check for warnings:
+  grep -q ^W $TMPFILE
+  if [ $? -eq 0 ] ; then
+      echo "$CHR update gave the following warnings:"
+      grep ^W $TMPFILE
+  fi
+  rm -f $TMPFILE

 
   THIS_LIST=`$CHR apt-get -s -u upgrade | awk '/^Inst/ {print $2}'`
   if [ "$THIS_LIST"x != ""x ] ; then
 
   THIS_LIST=`$CHR apt-get -s -u upgrade | awk '/^Inst/ {print $2}'`
   if [ "$THIS_LIST"x != ""x ] ; then

diff --git a/debian/tmp/usr/share/doc/apt-update/changelog.gz b/debian/tmp/usr/share/doc/apt-update/changelog.gz
index 821f5c4..5db29d5 100644 (file)
Binary files a/debian/tmp/usr/share/doc/apt-update/changelog.gz and b/debian/tmp/usr/share/doc/apt-update/changelog.gz differ