Juju Charms Collection
ubuntu-repository-cache package

Merge lp:~daniel-thewatkins/charms/trusty/ubuntu-repository-cache/fix-full-disk-formatting into lp:charms/trusty/ubuntu-repository-cache

  1. Trusty Tahr (14.04)
  2. fix-full-disk-formatting
  3. Merge into trunk
Proposed by Dan Watkins on 2015-08-05
Status: Merged
Merged at revision: 199
Proposed branch: lp:~daniel-thewatkins/charms/trusty/ubuntu-repository-cache/fix-full-disk-formatting
Merge into: lp:charms/trusty/ubuntu-repository-cache
Diff against target: 12 lines (+1/-1)
1 file modified
lib/ubuntu_repository_cache/storage.py (+1/-1)
To merge this branch: bzr merge lp:~daniel-thewatkins/charms/trusty/ubuntu-repository-cache/fix-full-disk-formatting
Reviewer Review Type Date Requested Status
José Antonio Rey 2015-08-05 Approve on 2015-08-11
Review via email: mp+267011@code.launchpad.net
To post a comment you must log in.
José Antonio Rey (jose) wrote :

Hey Daniel,

Thanks for the fix! Tested and no errors found.

+1 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/storage.py'
2--- lib/ubuntu_repository_cache/storage.py 2015-08-03 14:01:58 +0000
3+++ lib/ubuntu_repository_cache/storage.py 2015-08-05 11:22:21 +0000
4@@ -142,7 +142,7 @@
5 mountpoint = '/'.join((ephemeral_dir, str(devno)))
6
7 Storage.zap_disk(dev)
8- subprocess.check_call(['mkfs', '-t', 'ext4', '-L', label, dev])
9+ subprocess.check_call(['mkfs', '-F', '-t', 'ext4', '-L', label, dev])
10
11 # Remove any existing fstab entry
12 ftab = fstab.Fstab()

Subscribers

People subscribed via source and target branches

to all changes: