Merge lp:~xnox/apt-btrfs-snapshot/tools2progs into lp:apt-btrfs-snapshot

[Dimitri John Ledkov]

tools got renamed to progs, and the transitional package is now being dropped.

[Dimitri John Ledkov (xnox)]

ah, and this fails to build, because of new pyflakes / pep8. Oh, well, will need to refix that too.

[lp:~xnox/apt-btrfs-snapshot/tools2progs]

56. By Dimitri John Ledkov on 2018-05-23

Fix new pep8/pyflakes warnings.

Unmerged revisions

56. By Dimitri John Ledkov on 2018-05-23

Fix new pep8/pyflakes warnings.

55. By Dimitri John Ledkov on 2018-05-22

Change btrfs-tools dependency to progs.

=== modified file 'apt-btrfs-snapshot'
--- apt-btrfs-snapshot	2015-10-16 09:27:08 +0000
+++ apt-btrfs-snapshot	2018-05-23 10:13:00 +0000
@@ -19,13 +19,9 @@
 
 
 import argparse
-import datetime
 import logging
 import os
-import string
-import subprocess
 import sys
-import tempfile
 
 import gettext
 from gettext import gettext as _
 
=== modified file 'apt_btrfs_snapshot.py'
--- apt_btrfs_snapshot.py	2016-04-29 15:13:38 +0000
+++ apt_btrfs_snapshot.py	2018-05-23 10:13:00 +0000
@@ -184,7 +184,7 @@
             If "older_then" is given (in unixtime format) it will only include
             snapshots that are older then the given date)
         """
-        l = []
+        result = []
         # if older_than is used, ensure that the rootfs does not use
         # "noatime"
         if older_than != 0:
@@ -203,9 +203,9 @@
                 # created (to check if there is support for btrfs)
                 atime = os.path.getatime(os.path.join(mp, e, "etc", "fstab"))
                 if atime < older_than:
-                    l.append(e)
+                    result.append(e)
         self.umount_btrfs_root_volume()
-        return l
+        return result
 
     def print_btrfs_root_snapshots(self):
         print("Available snapshots:")
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-04-29 15:13:38 +0000
+++ debian/changelog	2018-05-23 10:13:00 +0000
@@ -1,3 +1,10 @@
+apt-btrfs-snapshot (3.5.2) cosmic; urgency=medium
+
+  * Change btrfs-tools dependency to progs.
+  * Fix new pep8/pyflakes warnings.
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 22 May 2018 10:56:22 +0100
+
 apt-btrfs-snapshot (3.5.1) yakkety; urgency=medium
 
   * fix mock of "btrfs" binary
 
=== modified file 'debian/control'
--- debian/control	2012-10-26 09:27:26 +0000
+++ debian/control	2018-05-23 10:13:00 +0000
@@ -21,7 +21,7 @@
 Depends: ${python:Depends},
          ${python3:Depends},
          ${misc:Depends},
-         btrfs-tools
+         btrfs-progs
 Description: Automatically create snapshot on apt operations
  This will create a btrfs snapshot of the root filesystem each time
  that apt installs/removes/upgrades a software package. 
 
=== modified file 'test/test_apt_btrfs_snapshot.py'
--- test/test_apt_btrfs_snapshot.py	2016-04-29 15:13:38 +0000
+++ test/test_apt_btrfs_snapshot.py	2018-05-23 10:13:00 +0000
@@ -126,5 +126,6 @@
         t = apt_btrfs._parse_older_than_to_unixtime("5d")
         self.assertTrue((t < time.time()) - (5 * 60 * 60 * 24))
 
+
 if __name__ == "__main__":
     unittest.main()