Ubuntu Mirror scripts

Merge lp:~jpds/ubumirror/no-stale-trace into lp:ubumirror

  1. no-stale-trace
  2. Merge into trunk
Proposed by Jonathan Davies
Status: Merged
Merged at revision: 62
Proposed branch: lp:~jpds/ubumirror/no-stale-trace
Merge into: lp:ubumirror
Diff against target: 86 lines (+18/-4)
5 files modified
debian/changelog (+9/-0)
ubuarchive (+1/-1)
ubucdimage (+2/-0)
ubuports (+4/-2)
uburelease (+2/-1)
To merge this branch: bzr merge lp:~jpds/ubumirror/no-stale-trace
Reviewer Review Type Date Requested Status
Nafallo Bjälevik code Approve
Review via email: mp+21659@code.launchpad.net

Commit message

Bring back the exclusion of only the host's trace file, removal all stale ones which are not upstream.

Description of the change

Bring back the exclusion of only the host's trace file, removal all stale ones which are not upstream.

To post a comment you must log in.
Revision history for this message
Nafallo Bjälevik (nafallo) wrote :

Not sure about the packaging version, but will leave that for now since it has history.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-03-08 19:36:29 +0000
3+++ debian/changelog 2010-03-18 17:41:39 +0000
4@@ -1,3 +1,12 @@
5+ubumirror (0.3ubuntu1) UNRELEASED; urgency=low
6+
7+ * 0.3ubuntu1 update.
8+
9+ [ Jonathan Davies ]
10+ * Remove trace files which aren't upstream by default.
11+
12+ -- Jonathan Davies <jpds@ubuntu.com> Thu, 18 Mar 2010 17:38:13 +0000
13+
14 ubumirror (0.2ubuntu1) lucid; urgency=low
15
16 * 0.2ubuntu1 update.
17
18=== modified file 'ubuarchive'
19--- ubuarchive 2010-03-17 10:38:13 +0000
20+++ ubuarchive 2010-03-18 17:41:39 +0000
21@@ -85,7 +85,7 @@
22
23 rsync -av --timeout=600 --partial --delete --delete-after \
24 --bwlimit=$SPEED \
25- --exclude "pool/" --exclude "project/trace/" \
26+ --exclude "pool/" --exclude "project/trace/${HOSTNAME}" \
27 --exclude "Archive-Update-in-Progress-${HOSTNAME}" \
28 $UBUARC_EXCLUDE \
29 $UBUARC_MIRROR $UBUARC_DIR
30
31=== modified file 'ubucdimage'
32--- ubucdimage 2010-02-17 23:27:41 +0000
33+++ ubucdimage 2010-03-18 17:41:39 +0000
34@@ -71,6 +71,7 @@
35
36 rsync -av --partial --timeout=600 \
37 --bwlimit=$SPEED \
38+ --exclude ".trace/${HOSTNAME}" \
39 $UBUCDI_EXCLUDE \
40 $UBUCDI_MIRROR/daily/current/ $UBUALTN
41
42@@ -87,6 +88,7 @@
43
44 rsync -av --partial --timeout=600 \
45 --bwlimit=$SPEED \
46+ --exclude ".trace/${HOSTNAME}" \
47 $UBUCDI_EXCLUDE \
48 $UBUCDI_MIRROR/daily-live/current/ $UBULIVE
49
50
51=== modified file 'ubuports'
52--- ubuports 2010-02-24 13:01:41 +0000
53+++ ubuports 2010-03-18 17:41:39 +0000
54@@ -67,7 +67,8 @@
55
56 rsync -av --timeout=600 --partial --delete --delete-after \
57 --bwlimit=$SPEED \
58- --exclude "indices/" --exclude "dists/" --exclude "project/trace/" \
59+ --exclude "indices/" --exclude "dists/"
60+ --exclude "project/trace/${HOSTNAME}" \
61 --exclude "Archive-Update-in-Progress-${HOSTNAME}" \
62 $UBUPOR_EXCLUDE \
63 $UBUPOR_MIRROR $UBUPOR_DIR
64@@ -85,7 +86,8 @@
65
66 rsync -av --timeout=600 --partial --delete --delete-after \
67 --bwlimit=$SPEED \
68- --exclude "pool/" --exclude "project/trace/" \
69+ --exclude "pool/"
70+ --exclude "project/trace/${HOSTNAME}" \
71 --exclude "Archive-Update-in-Progress-${HOSTNAME}" \
72 $UBUPOR_EXCLUDE \
73 $UBUPOR_MIRROR $UBUPOR_DIR
74
75=== modified file 'uburelease'
76--- uburelease 2010-02-24 12:48:01 +0000
77+++ uburelease 2010-03-18 17:41:39 +0000
78@@ -66,7 +66,8 @@
79 echo "$(date -R): Initiating Ubuntu release CD image sync..."
80
81 rsync -av --partial --timeout=600 --bwlimit=$SPEED --delete-after \
82- --exclude .trace --exclude Archive-Update-in-Progress-* \
83+ --exclude ".trace/${HOSTNAME}" \
84+ --exclude Archive-Update-in-Progress-* \
85 $UBUREL_EXCLUDE \
86 $UBUREL_MIRROR $UBUREL_DIR
87

Subscribers

People subscribed via source and target branches

to status/vote changes: