apt-btrfs-snapshot

Merge lp:~siretart/apt-btrfs-snapshot/yakkety into lp:apt-btrfs-snapshot

  1. yakkety
  2. Merge into trunk
Proposed by Reinhard Tartler
Status: Merged
Merged at revision: 53
Proposed branch: lp:~siretart/apt-btrfs-snapshot/yakkety
Merge into: lp:apt-btrfs-snapshot
Diff against target: 73 lines (+15/-8)
3 files modified
apt_btrfs_snapshot.py (+4/-4)
debian/changelog (+8/-2)
test/test_apt_btrfs_snapshot.py (+3/-2)
To merge this branch: bzr merge lp:~siretart/apt-btrfs-snapshot/yakkety
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Review via email: mp+293242@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'apt_btrfs_snapshot.py'
2--- apt_btrfs_snapshot.py 2015-10-16 09:22:38 +0000
3+++ apt_btrfs_snapshot.py 2016-04-28 11:11:26 +0000
4@@ -25,7 +25,6 @@
5 import time
6 import tempfile
7
8-import gettext
9 from gettext import gettext as _
10
11
12@@ -168,11 +167,12 @@
13 mp = self.mount_btrfs_root_volume()
14 snap_id = self._get_now_str()
15 source = os.path.join(mp, "@")
16- target = os.path.join(mp, self.SNAP_PREFIX + additional_prefix + snap_id)
17+ target = os.path.join(mp, self.SNAP_PREFIX + additional_prefix +
18+ snap_id)
19
20 if os.path.exists(target):
21- print(_("INFO: snapshot directory '%s' already exists, not creating duplicate")
22- % (target,))
23+ print(_("INFO: snapshot directory '%s' already exists, "
24+ "not creating duplicate") % (target,))
25 return True
26 else:
27 res = self.commands.btrfs_subvolume_snapshot(source, target)
28
29=== modified file 'debian/changelog'
30--- debian/changelog 2015-10-16 09:27:08 +0000
31+++ debian/changelog 2016-04-28 11:11:26 +0000
32@@ -1,5 +1,8 @@
33-apt-btrfs-snapshot (3.5) UNRELEASED; urgency=medium
34+apt-btrfs-snapshot (3.5) yakkety; urgency=medium
35
36+ [ Michael Vogt ]
37+ * Merge changes from Doko and others
38+
39 [ Yurii Kolesnukov ]
40 * Fix detection of btrfs binary on Debinan stretch (LP: #1454306)
41
42@@ -10,7 +13,10 @@
43 * lp:~bgeron/apt-btrfs-snapshot/silence-apt:
44 - improve apt-btfs-snapshot supported message
45
46- -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 16 Oct 2015 11:19:30 +0200
47+ [ Reinhard Tartler ]
48+ * Fix pep8 / pylint tests
49+
50+ -- Reinhard Tartler <siretart@tauware.de> Thu, 28 Apr 2016 07:07:25 -0400
51
52 apt-btrfs-snapshot (0.3.4.2) trusty; urgency=medium
53
54
55=== modified file 'test/test_apt_btrfs_snapshot.py'
56--- test/test_apt_btrfs_snapshot.py 2015-05-17 05:21:59 +0000
57+++ test/test_apt_btrfs_snapshot.py 2016-04-28 11:11:26 +0000
58@@ -11,13 +11,14 @@
59 import time
60 import unittest
61
62-sys.path.insert(0, "..")
63-sys.path.insert(0, ".")
64 from apt_btrfs_snapshot import (
65 AptBtrfsSnapshot,
66 AptBtrfsRootWithNoatimeError,
67 )
68
69+sys.path.insert(0, "..")
70+sys.path.insert(0, ".")
71+
72
73 class TestFstab(unittest.TestCase):
74

Subscribers

People subscribed via source and target branches

to all changes: