Juju Charms Collection
ubuntu-repository-cache package

Merge lp:~rcj/charms/trusty/ubuntu-repository-cache/lp1500442 into lp:charms/trusty/ubuntu-repository-cache

  1. Trusty Tahr (14.04)
  2. lp1500442
  3. Merge into trunk
Proposed by Robert C Jennings
Status: Merged
Merged at revision: 204
Proposed branch: lp:~rcj/charms/trusty/ubuntu-repository-cache/lp1500442
Merge into: lp:charms/trusty/ubuntu-repository-cache
Diff against target: 30 lines (+3/-3)
1 file modified
lib/ubuntu_repository_cache/mirror.py (+3/-3)
To merge this branch: bzr merge lp:~rcj/charms/trusty/ubuntu-repository-cache/lp1500442
Reviewer Review Type Date Requested Status
Marco Ceppi (community) Approve
Dan Watkins (community) Approve
Charles Butler Pending
Review via email: mp+272662@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dan Watkins (oddbloke) wrote :

LGTM

review: Approve
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/ubuntu_repository_cache/mirror.py'
2--- lib/ubuntu_repository_cache/mirror.py 2015-09-11 15:51:59 +0000
3+++ lib/ubuntu_repository_cache/mirror.py 2015-09-28 20:59:22 +0000
4@@ -46,7 +46,7 @@
5 '''
6
7 source = archive_ip + '::ubuntu/'
8- host.mkdir(dest, owner='www-sync', group='www-data')
9+ host.mkdir(dest, owner='www-sync', group='www-data', perms=0o775)
10 apache_data = '/'.join((hookenv.config()['apache-root'], 'data'))
11 link_dest = '/'.join((apache_data, 'ubuntu_active'))
12
13@@ -143,7 +143,7 @@
14 archive_ips.insert(0, archive_ip)
15 time.sleep(30)
16 else:
17- LOG('No retries left. (attempt #%s)' % (update_retry + 1))
18+ LOG('No retries left. (attempt #%s)' % update_retry)
19 update_retry = 0
20 continue
21
22@@ -160,7 +160,7 @@
23 archive_ips.insert(0, archive_ip)
24 time.sleep(30)
25 else:
26- LOG('No retries left. (attempt #%s)' % (update_retry + 1))
27+ LOG('No retries left. (attempt #%s)' % update_retry)
28 update_retry = 0
29 continue
30 else:

Subscribers

People subscribed via source and target branches

to all changes: