Merge lp:~tjguthrie4600/ubuntu/trusty/apt/bug-1206047 into lp:ubuntu/trusty/apt

Proposed by TJ Guthrie on 2013-11-18
Status: Merged
Merge reported by: Michael Terry
Merged at revision: not available
Proposed branch: lp:~tjguthrie4600/ubuntu/trusty/apt/bug-1206047
Merge into: lp:ubuntu/trusty/apt
Diff against target: 33 lines (+10/-2)
2 files modified
debian/apt.cron.daily (+2/-2)
debian/changelog (+8/-0)
To merge this branch: bzr merge lp:~tjguthrie4600/ubuntu/trusty/apt/bug-1206047
Reviewer Review Type Date Requested Status
Michael Terry 2013-11-18 Approve on 2013-11-22
Review via email: mp+195553@code.launchpad.net

Description of the change

In debian/apt.cron.daily

Changed line 200:
From: debug_echo "skip remove by archive size: $file, delta=$delta < $MinAgeSec"
To: debug_echo "skip remove by archive size: $file, delta=$delta < $MinAge"

Changed line 204:
From: debug_echo "remove by archive size: $file, delta=$delta >= $MinAgeSec (sec), size=$size >=$MaxSize"
To: debug_echo "remove by archive size: $file, delta=$delta >= $MinAge (sec), size=$size >= $MaxSize"

To post a comment you must log in.
Craig Hrabal (crhrabal) wrote :

Looks good!

208. By TJ Guthrie <tguthri1@wheezy> on 2013-11-18

Fixed debian change log version

Michael Terry (mterry) wrote :

Yup, looks good. Thanks so much!

I've uploaded to Ubuntu.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/apt.cron.daily'
2--- debian/apt.cron.daily 2013-07-10 17:03:52 +0000
3+++ debian/apt.cron.daily 2013-11-18 22:54:02 +0000
4@@ -197,11 +197,11 @@
5 delta=$(($now-$ctime))
6 fi
7 if [ $delta -le $MinAge ]; then
8- debug_echo "skip remove by archive size: $file, delta=$delta < $MinAgeSec"
9+ debug_echo "skip remove by archive size: $file, delta=$delta < $MinAge"
10 break
11 else
12 # delete oldest file
13- debug_echo "remove by archive size: $file, delta=$delta >= $MinAgeSec (sec), size=$size >= $MaxSize"
14+ debug_echo "remove by archive size: $file, delta=$delta >= $MinAge (sec), size=$size >= $MaxSize"
15 rm -f $file
16 fi
17 fi
18
19=== modified file 'debian/changelog'
20--- debian/changelog 2013-11-02 14:02:38 +0000
21+++ debian/changelog 2013-11-18 22:54:02 +0000
22@@ -1,3 +1,11 @@
23+apt (0.9.9.1~ubuntu5) trusty; urgency=low
24+
25+ * Non-maintainer upload
26+ * Changed MinAgeSec to MinAge in /etc/cron.daily/apt:200,204
27+ * LP: #1206047
28+
29+ -- TJ Guthrie (TJ) <TJ.Guthrie@mail.wvu.edu> Mon, 18 Nov 2013 03:06:36 -0500
30+
31 apt (0.9.9.1~ubuntu4) trusty; urgency=low
32
33 * No change rebuild against db 5.3.

Subscribers

People subscribed via source and target branches

to all changes: