summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Zimmerman <matt.zimmerman@canonical.com>2005-05-06 07:53:58 +0000
committerMatt Zimmerman <matt.zimmerman@canonical.com>2005-05-06 07:53:58 +0000
commit61abe43c0b6c74ef561c093bbd0c0d4626558655 (patch)
treea414a95ff0c3c3f9e0ac9af8d75266a04c3fcb15
parentea8704883049f180ca1c5607f1de0118b7d86c60 (diff)
parent0cf356f7170248c00406a6708bee1c812b58a8bf (diff)
Merge michael.vogt@ubuntu.com--2005/apt--mvo--0
Patches applied: * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-20 * supress output when /var/cache/apt/archives is empty; break when min-age is reached * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-21 * changed distro to "experimental", changed version number to 0.6.36
-rw-r--r--debian/apt.cron.daily4
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 5145a5d2f..2d93a5ba4 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -110,7 +110,7 @@ check_size_constraints()
MinAge=$(($MinAge*24*60*60))
# reverse-sort by mtime
- for file in $(ls -rt $Cache/*.deb); do
+ for file in $(ls -rt $Cache/*.deb 2>/dev/null); do
du=$(du -s $Cache)
size=${du%%/*}
# check if the cache is small enough
@@ -125,7 +125,7 @@ check_size_constraints()
#echo "$file ($delta), $MinAge"
if [ $delta -le $MinAge ]; then
#echo "Skiping $file (delta=$delta)"
- continue
+ break
fi
fi
diff --git a/debian/changelog b/debian/changelog
index a6886490c..87e713d3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.6.36) unstable; urgency=low
+apt (0.6.36) experimental; urgency=low
* Merge apt--mvo--0:
- apt-pkg/acquire-item.cc: