apt-btrfs-snapshot

1	=== modified file 'apt_btrfs_snapshot.py'
2	--- apt_btrfs_snapshot.py 2013-01-06 02:45:03 +0000
3	+++ apt_btrfs_snapshot.py 2015-05-17 05:41:15 +0000
4	@@ -119,7 +119,8 @@
5	by checking if the right fs layout is used etc
6	"""
7	# check for the helper binary
8	- if not os.path.exists("/sbin/btrfs"):
9	+ from distutils.spawn import find_executable
10	+ if not (find_executable("btrfs")):
11	return False
12	# check the fstab
13	entry = self._get_supported_btrfs_root_fstab_entry()
14
15	=== modified file 'debian/changelog'
16	--- debian/changelog 2014-02-20 20:24:17 +0000
17	+++ debian/changelog 2015-05-17 05:41:15 +0000
18	@@ -1,3 +1,9 @@
19	+apt-btrfs-snapshot (3.4.4.3) UNRELEASED; urgency=medium
20	+
21	+ * Fix detection of btrfs binary on Debinan stretch (LP: #1454306)
22	+
23	+ -- Yurii Kolesnukov <yurikoles@hutba.org> Sun, 17 May 2015 08:03:57 +0300
24	+
25	apt-btrfs-snapshot (0.3.4.2) trusty; urgency=medium
26
27	* Rewrite the python shebang path to /usr/bin/python3.
28
29	=== modified file 'test/test_apt_btrfs_snapshot.py'
30	--- test/test_apt_btrfs_snapshot.py 2013-01-06 02:45:03 +0000
31	+++ test/test_apt_btrfs_snapshot.py 2015-05-17 05:41:15 +0000
32	@@ -26,7 +26,7 @@
33
34	@mock.patch('os.path.exists')
35	def test_fstab_detect_snapshot(self, mock_commands):
36	- #Using python-mock 0.7 style, for precise compatibility
37	+ # Using python-mock 0.7 style, for precise compatibility
38	mock_commands.side_effect = lambda f: f in ('/sbin/btrfs')
39	apt_btrfs = AptBtrfsSnapshot(
40	fstab=os.path.join(self.testdir, "data", "fstab"))

Merge lp:~yurikoles/apt-btrfs-snapshot/1454306 into lp:apt-btrfs-snapshot