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

[yurikoles]

=== modified file 'apt_btrfs_snapshot.py'
--- apt_btrfs_snapshot.py	2013-01-06 02:45:03 +0000
+++ apt_btrfs_snapshot.py	2015-05-17 05:41:15 +0000
@@ -119,7 +119,8 @@
             by checking if the right fs layout is used etc
         """
         # check for the helper binary
-        if not os.path.exists("/sbin/btrfs"):
+        from distutils.spawn import find_executable
+        if not (find_executable("btrfs")):
             return False
         # check the fstab
         entry = self._get_supported_btrfs_root_fstab_entry()

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-20 20:24:17 +0000
+++ debian/changelog	2015-05-17 05:41:15 +0000
@@ -1,3 +1,9 @@
+apt-btrfs-snapshot (3.4.4.3) UNRELEASED; urgency=medium
+
+  * Fix detection of btrfs binary on Debinan stretch (LP: #1454306)
+
+ -- Yurii Kolesnukov <[e-mail]>  Sun, 17 May 2015 08:03:57 +0300
+
 apt-btrfs-snapshot (0.3.4.2) trusty; urgency=medium
 
   * Rewrite the python shebang path to /usr/bin/python3.

=== modified file 'test/test_apt_btrfs_snapshot.py'
--- test/test_apt_btrfs_snapshot.py	2013-01-06 02:45:03 +0000
+++ test/test_apt_btrfs_snapshot.py	2015-05-17 05:41:15 +0000
@@ -26,7 +26,7 @@
 
     @mock.patch('os.path.exists')
     def test_fstab_detect_snapshot(self, mock_commands):
-        #Using python-mock 0.7 style, for precise compatibility
+        # Using python-mock 0.7 style, for precise compatibility
         mock_commands.side_effect = lambda f: f in ('/sbin/btrfs')
         apt_btrfs = AptBtrfsSnapshot(
             fstab=os.path.join(self.testdir, "data", "fstab"))