use update-apt-xapian-index -u on armel

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 1dfaa04a3fd135dfe809dd93d29af7914b486d7d..efc61362cf3a2745dad275424b6792d175562745 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -457,7 +457,10 @@ if check_stamp $UPDATE_STAMP $UpdateInterval; then
         # now run apt-xapian-index if it is installed to ensure the index
         # is up-to-date
         if [ -x /usr/sbin/update-apt-xapian-index ]; then
         # now run apt-xapian-index if it is installed to ensure the index
         # is up-to-date
         if [ -x /usr/sbin/update-apt-xapian-index ]; then

-            nice ionice -c3 update-apt-xapian-index -q
+            if [ "$(dpkg --print-architecture)" = "armel" ]; then
+                xapian_extra_args='-u'
+            fi
+            nice ionice -c3 update-apt-xapian-index -q $xapian_extra_args

         fi
     else
        debug_echo "download updated metadata (error)"
         fi
     else
        debug_echo "download updated metadata (error)"

diff --git a/debian/changelog b/debian/changelog
index 18ef6f2f885b9656df3061a5715a4552bf16af90..e3944d76953f5539051037c8f9e2cdf2e7a7c2ad 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.8.16~exp5ubuntu13) UNRELEASED; urgency=low
+
+  * On armel, call update-apt-xapian-index with '-u' to keep the CPU
+    and I/O usage low.  We would do this on all arches, but there's a
+    regression risk here, but that's better than killing slow systems.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 04 Oct 2011 01:24:01 -0600
+

 apt (0.8.16~exp5ubuntu12) oneiric; urgency=low
 
   [ David Kalnischkies ]  
 apt (0.8.16~exp5ubuntu12) oneiric; urgency=low
 
   [ David Kalnischkies ]