From da50bcdb96538361427038db750475fdb854712a Mon Sep 17 00:00:00 2001 From: boyska Date: Mon, 9 Jan 2017 16:56:59 +0100 Subject: [PATCH 1/2] FIX scripts suggestions cause crash on web edit The directory was assumed to be existing, which is wrong --- larigira/dbadmin/suggestions.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/larigira/dbadmin/suggestions.py b/larigira/dbadmin/suggestions.py index f659442..31ea39e 100644 --- a/larigira/dbadmin/suggestions.py +++ b/larigira/dbadmin/suggestions.py @@ -41,6 +41,8 @@ def get_suggested_dirs(): def get_suggested_scripts(): base = get_conf()['SCRIPTS_PATH'] + if not base or not os.path.isdir(base): + return [] fnames = [f for f in os.listdir(base) if os.access(os.path.join(base, f), os.R_OK | os.X_OK)] return fnames From eec9ecee8c5aac5f01d288dbf3295c6b308d1601 Mon Sep 17 00:00:00 2001 From: boyska Date: Mon, 9 Jan 2017 17:04:56 +0100 Subject: [PATCH 2/2] Hotfix release: 1.0.1 --- doc/source/conf.py | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 114c6de..2966dfe 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -53,7 +53,7 @@ master_doc = 'index' # General information about the project. project = 'larigira' -copyright = '2015-2016, boyska' +copyright = '2015-2017, boyska' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -62,7 +62,7 @@ copyright = '2015-2016, boyska' # The short X.Y version. version = '1.0' # The full version, including alpha/beta/rc tags. -release = '1.0' +release = '1.0.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index f0a0ac0..750e4f0 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ class PyTest(TestCommand): sys.exit(errno) setup(name='larigira', - version='1.0', + version='1.0.1', description='A radio automation based on MPD', long_description=read('README.rst'), author='boyska',