Fixed issue with checking for stash in output of git cmds

Disabled creating docker tags for develop branch

.gitlab-ci.yml

@@ -18,11 +18,11 @@ build-master:
  except:
  - tags
 
-build-dev:
- stage: build
- script:
- - docker build --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --build-arg VERSION=`cat sickrage/version.txt` -t sickrage/sickrage:$CI_COMMIT_REF_SLUG .
- - docker push sickrage/sickrage:$CI_COMMIT_REF_SLUG
- except:
- - master
- - tags
\ No newline at end of file
+#build-dev:
+# stage: build
+# script:
+# - docker build --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --build-arg VERSION=`cat sickrage/version.txt` -t sickrage/sickrage:$CI_COMMIT_REF_SLUG .
+# - docker push sickrage/sickrage:$CI_COMMIT_REF_SLUG
+# except:
+# - master
+# - tags
\ No newline at end of file

changelog.md

 # Changelog
 
-- * 373e2c3 - 2018-10-15: Release v9.3.94 
+- * c69361d - 2018-10-16: Fixed issue with checking for stash in output of git cmds Disabled creating docker tags for develop branch 
+- * 8b3319d - 2018-10-15: Release v9.3.94 
 - * 47ce84c - 2018-10-16: Update .gitlab-ci.yml 
 - * bc472cc - 2018-10-16: Update .gitlab-ci.yml 
 - * eb1a642 - 2018-10-15: Release v9.3.93 

sickrage/core/version_updater.py

@@ -294,11 +294,14 @@ class UpdateManager(object):
  sickrage.app.log.debug(' '.join(cmd) + " : returned successful")
  exit_status = 0
  elif exit_status == 1:
- if 'stash' in output:
- sickrage.app.log.warning(
- "Please enable 'git reset' in settings or stash your changes in local files")
+ if output:
+ if 'stash' in output:
+ sickrage.app.log.warning(
+ "Please enable 'git reset' in settings or stash your changes in local files")
+ else:
+ sickrage.app.log.debug(' '.join(cmd) + " returned : " + str(output))
  else:
- sickrage.app.log.debug(' '.join(cmd) + " returned : " + str(output))
+ sickrage.app.log.warning('{} returned no data'.format(cmd))
  exit_status = 1
  elif exit_status == 128 or 'fatal:' in output or err:
  sickrage.app.log.debug(' '.join(cmd) + " returned : " + str(output))

sickrage/core/webserver/views/config/general.mako

@@ -1062,7 +1062,6 @@
  </div>
 
  <div class="form-row form-group">
-
  <div class="col-lg-3 col-md-4 col-sm-5">
  <label class="component-title">${_('Unprotected calendar')}</label>
  </div>
@@ -1073,12 +1072,9 @@
  ${_('allow subscribing to the calendar without user and password. Some services like Google Calendar only work this way')}
  </label>
  </div>
-
-
  </div>
 
  <div class="form-row form-group">
-
  <div class="col-lg-3 col-md-4 col-sm-5">
  <label class="component-title">${_('Google Calendar Icons')}</label>
  </div>