Merge branch 'release-11.8.1'

clinton-hall · Dec 29, 2018 · 4fed4d8 · 4fed4d8
2 parents c5dad74 + 7244f87
commit 4fed4d8
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 11.8.0
+current_version = 11.8.1
 commit = True
 tag = False
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-nzbToMedia v11.8.0
+nzbToMedia v11.8.1
 ==================
 
 Provides an [efficient](https://github.com/clinton-hall/nzbToMedia/wiki/Efficient-on-demand-post-processing) way to handle postprocessing for [CouchPotatoServer](https://couchpota.to/ "CouchPotatoServer") and [SickBeard](http://sickbeard.com/ "SickBeard") (and its [forks](https://github.com/clinton-hall/nzbToMedia/wiki/Failed-Download-Handling-%28FDH%29#sick-beard-and-its-forks))

diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,9 @@
 Change_LOG / History
 
+V11.8.1 12/29/2018
+
+Fix cleanup for nzbToMedia installed as a git submodule
+
 V11.8.0 12/28/2018
 
 Add version information

diff --git a/cleanup.py b/cleanup.py
@@ -109,23 +109,29 @@ def clean(*paths):
     with WorkingDirectory(module_path()) as cwd:
         if cwd.working_directory != cwd.original_directory:
             print('Changing to directory:', cwd.working_directory)
+
         print('\n-- Cleaning bytecode --')
         try:
             result = clean_bytecode()
         except SystemExit as error:
             print(error)
         else:
             print(result or 'No bytecode to clean')
-        if paths:
+
+        if paths and os.path.exists('.git'):
             print('\n-- Cleaning folders: {} --'.format(paths))
             try:
                 result = clean_folders(*paths)
             except SystemExit as error:
                 print(error)
             else:
                 print(result or 'No folders to clean\n')
+        else:
+            print('Directory is not a git repository')
+
         if cwd.working_directory != cwd.original_directory:
             print('Returning to directory: ', cwd.original_directory)
+
         print('\n-- Cleanup finished --\n')
 
 

diff --git a/core/__init__.py b/core/__init__.py
@@ -49,7 +49,7 @@
 from core.transcoder import transcoder
 from core.databases import mainDB
 
-__version__ = '11.8.0'
+__version__ = '11.8.1'
 
 # Client Agents
 NZB_CLIENTS = ['sabnzbd', 'nzbget', 'manual']

diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@ def read(*names, **kwargs):
 
 setup(
     name='nzbToMedia',
-    version='11.8.0',
+    version='11.8.1',
     license='GPLv3',
     description='Efficient on demand post processing',
     long_description="""