Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
Dear Release Team,
Please consider unblocking variety 0.7.1-2. I've backported a couple of
fixes from the newest upstream version, which fix a couple of subtle but
annoying bugs. The changelog is as follows:
variety (0.7.1-2) unstable; urgency=medium
* Backport bugfixes from Variety 0.7.2:
- fix-crash-on-help-version.patch: Don't forward --help or --version to
running Variety instances, as this causes it to crash.
- fix-spurious-error-when-analyzing-gifs.patch: Fix spurious
FileNotFoundError when analyzing GIFs inside a wallpaper folder
-- James Lu Sun, 21 Apr 2019 19:10:58 -0700
The debdiff is attached.
Best,
James
diff -Nru variety-0.7.1/debian/changelog variety-0.7.1/debian/changelog
--- variety-0.7.1/debian/changelog 2018-10-28 20:45:18.0 -0700
+++ variety-0.7.1/debian/changelog 2019-04-21 19:10:58.0 -0700
@@ -1,3 +1,13 @@
+variety (0.7.1-2) unstable; urgency=medium
+
+ * Backport bugfixes from Variety 0.7.2:
+- fix-crash-on-help-version.patch: Don't forward --help or --version to
+ running Variety instances, as this causes it to crash.
+- fix-spurious-error-when-analyzing-gifs.patch: Fix spurious
+ FileNotFoundError when analyzing GIFs inside a wallpaper folder
+
+ -- James Lu Sun, 21 Apr 2019 19:10:58 -0700
+
variety (0.7.1-1) unstable; urgency=medium
[ Jelmer Vernooij ]
diff -Nru variety-0.7.1/debian/patches/fix-crash-on-help-version.patch
variety-0.7.1/debian/patches/fix-crash-on-help-version.patch
--- variety-0.7.1/debian/patches/fix-crash-on-help-version.patch
1969-12-31 16:00:00.0 -0800
+++ variety-0.7.1/debian/patches/fix-crash-on-help-version.patch
2019-04-21 19:10:58.0 -0700
@@ -0,0 +1,33 @@
+Description: Don't forward --help or --version to running Variety instances,
as this causes it to crash.
+ Parse options before checking for running instance to show help.
+Author: Pedro Romano
+Origin: upstream,
https://github.com/varietywalls/variety/commit/4977f86ffc662ae3909cf97f6baa892ea17b4fc5
+Applied-Upstream: 0.7.2
+---
+ variety/__init__.py | 6 --
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/variety/__init__.py
b/variety/__init__.py
+@@ -148,6 +148,9 @@
+
+ arguments = sys.argv[1:]
+
++# validate arguments
++options, args = VarietyWindow.VarietyWindow.parse_options(arguments)
++
+ bus = dbus.SessionBus()
+ # ensure singleton
+ if bus.request_name(DBUS_KEY) !=
dbus.bus.REQUEST_NAME_REPLY_PRIMARY_OWNER:
+@@ -161,10 +164,9 @@
+ safe_print(result)
+ return
+
+-# validate arguments and set up logging
++# set up logging
+ # set_up_logging must be called after the DBus checks, only by one
running instance,
+ # or the log file can be corrupted
+-options, args = VarietyWindow.VarietyWindow.parse_options(arguments)
+ set_up_logging(options.verbose)
+
+ if options.verbose >= 2:
diff -Nru
variety-0.7.1/debian/patches/fix-spurious-error-when-analyzing-gifs.patch
variety-0.7.1/debian/patches/fix-spurious-error-when-analyzing-gifs.patch
--- variety-0.7.1/debian/patches/fix-spurious-error-when-analyzing-gifs.patch
1969-12-31 16:00:00.0 -0800
+++ variety-0.7.1/debian/patches/fix-spurious-error-when-analyzing-gifs.patch
2019-04-21 19:10:58.0 -0700
@@ -0,0 +1,45 @@
+Description: Fix spurious FileNotFoundError when analyzing GIFs inside a
wallpaper folder.
+ The path being passed to the helper function was not correct.
+Author: James Lu
+Origin: upstream,
https://github.com/varietywalls/variety/commit/25714cd13e80602a5e08bf02ab1baf2dd9e1a97e
+Bug: https://github.com/varietywalls/variety/issues/132
+Applied-Upstream: 0.7.2
+---
+ variety/Util.py | 9 ++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/variety/Util.py b/variety/Util.py
+index 86c70de..e038ff0 100644
+--- a/variety/Util.py
b/variety/Util.py
+@@ -363,6 +363,7 @@ class Util:
+ def list_files(files=(), folders=(), filter_func=(lambda f: True),
max_files=1, randomize=True):
+ count = 0
+ for filepath in files:
++logger.debug(lambda: 'checking file %s against filter_func %s' %
(filepath, filter_func))
+ if filter_func(filepath) and os.access(filepath, os.R_OK):
+ count += 1
+ yield filepath
+@@ -379,14 +380,16 @@ class Util:
+ random.shuffle(files)
+ random.shuffle(subFolders)
+ for filename in files:
+-if filter_func(filename):
++logger.debug(lambda: 'checking file %s against
filter_func %s (root=%s)' % (filename, filter_func, root))
++path = os.path.join(root, filename)
++if filter_func(path):
+
