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

[Reinhard Tartler]

=== modified file 'apt_btrfs_snapshot.py'
--- apt_btrfs_snapshot.py	2015-10-16 09:22:38 +0000
+++ apt_btrfs_snapshot.py	2016-04-28 11:11:26 +0000
@@ -25,7 +25,6 @@
 import time
 import tempfile
 
-import gettext
 from gettext import gettext as _
 
 
@@ -168,11 +167,12 @@
         mp = self.mount_btrfs_root_volume()
         snap_id = self._get_now_str()
         source = os.path.join(mp, "@")
-        target = os.path.join(mp, self.SNAP_PREFIX + additional_prefix + snap_id)
+        target = os.path.join(mp, self.SNAP_PREFIX + additional_prefix +
+                              snap_id)
 
         if os.path.exists(target):
-            print(_("INFO: snapshot directory '%s' already exists, not creating duplicate")
-                % (target,))
+            print(_("INFO: snapshot directory '%s' already exists, "
+                    "not creating duplicate") % (target,))
             return True
         else:
             res = self.commands.btrfs_subvolume_snapshot(source, target)
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-10-16 09:27:08 +0000
+++ debian/changelog	2016-04-28 11:11:26 +0000
@@ -1,5 +1,8 @@
-apt-btrfs-snapshot (3.5) UNRELEASED; urgency=medium
+apt-btrfs-snapshot (3.5) yakkety; urgency=medium
 
+  [ Michael Vogt ]
+  * Merge changes from Doko and others
+  
   [ Yurii Kolesnukov ]
   * Fix detection of btrfs binary on Debinan stretch (LP: #1454306)
 
@@ -10,7 +13,10 @@
   * lp:~bgeron/apt-btrfs-snapshot/silence-apt:
     - improve apt-btfs-snapshot supported message
 
- -- Michael Vogt <[e-mail]>  Fri, 16 Oct 2015 11:19:30 +0200
+  [ Reinhard Tartler ]
+  * Fix pep8 / pylint tests
+
+ -- Reinhard Tartler <[e-mail]>  Thu, 28 Apr 2016 07:07:25 -0400
 
 apt-btrfs-snapshot (0.3.4.2) trusty; urgency=medium
 
 
=== modified file 'test/test_apt_btrfs_snapshot.py'
--- test/test_apt_btrfs_snapshot.py	2015-05-17 05:21:59 +0000
+++ test/test_apt_btrfs_snapshot.py	2016-04-28 11:11:26 +0000
@@ -11,13 +11,14 @@
 import time
 import unittest
 
-sys.path.insert(0, "..")
-sys.path.insert(0, ".")
 from apt_btrfs_snapshot import (
     AptBtrfsSnapshot,
     AptBtrfsRootWithNoatimeError,
 )
 
+sys.path.insert(0, "..")
+sys.path.insert(0, ".")
+
 
 class TestFstab(unittest.TestCase):