Commit 0f07f4b0 authored by echel0n's avatar echel0n
Browse files

Fixed issue with checking for stash in output of git cmds

Disabled creating docker tags for develop branch
parent b69a6ceb
...@@ -18,11 +18,11 @@ build-master: ...@@ -18,11 +18,11 @@ build-master:
except: except:
- tags - tags
build-dev: #build-dev:
stage: build # stage: build
script: # 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 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 # - docker push sickrage/sickrage:$CI_COMMIT_REF_SLUG
except: # except:
- master # - master
- tags # - tags
\ No newline at end of file \ No newline at end of file
# Changelog # 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 - * 47ce84c - 2018-10-16: Update .gitlab-ci.yml
- * bc472cc - 2018-10-16: Update .gitlab-ci.yml - * bc472cc - 2018-10-16: Update .gitlab-ci.yml
- * eb1a642 - 2018-10-15: Release v9.3.93 - * eb1a642 - 2018-10-15: Release v9.3.93
......
...@@ -294,11 +294,14 @@ class UpdateManager(object): ...@@ -294,11 +294,14 @@ class UpdateManager(object):
sickrage.app.log.debug(' '.join(cmd) + " : returned successful") sickrage.app.log.debug(' '.join(cmd) + " : returned successful")
exit_status = 0 exit_status = 0
elif exit_status == 1: elif exit_status == 1:
if 'stash' in output: if output:
sickrage.app.log.warning( if 'stash' in output:
"Please enable 'git reset' in settings or stash your changes in local files") 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: else:
sickrage.app.log.debug(' '.join(cmd) + " returned : " + str(output)) sickrage.app.log.warning('{} returned no data'.format(cmd))
exit_status = 1 exit_status = 1
elif exit_status == 128 or 'fatal:' in output or err: elif exit_status == 128 or 'fatal:' in output or err:
sickrage.app.log.debug(' '.join(cmd) + " returned : " + str(output)) sickrage.app.log.debug(' '.join(cmd) + " returned : " + str(output))
......
...@@ -1062,7 +1062,6 @@ ...@@ -1062,7 +1062,6 @@
</div> </div>
<div class="form-row form-group"> <div class="form-row form-group">
<div class="col-lg-3 col-md-4 col-sm-5"> <div class="col-lg-3 col-md-4 col-sm-5">
<label class="component-title">${_('Unprotected calendar')}</label> <label class="component-title">${_('Unprotected calendar')}</label>
</div> </div>
...@@ -1073,12 +1072,9 @@ ...@@ -1073,12 +1072,9 @@
${_('allow subscribing to the calendar without user and password. Some services like Google Calendar only work this way')} ${_('allow subscribing to the calendar without user and password. Some services like Google Calendar only work this way')}
</label> </label>
</div> </div>
</div> </div>
<div class="form-row form-group"> <div class="form-row form-group">
<div class="col-lg-3 col-md-4 col-sm-5"> <div class="col-lg-3 col-md-4 col-sm-5">
<label class="component-title">${_('Google Calendar Icons')}</label> <label class="component-title">${_('Google Calendar Icons')}</label>
</div> </div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment