Private GIT
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
SickRage
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
vlbox
SickRage
Commits
029dd7bf
Commit
029dd7bf
authored
Jul 4, 2015
by
Dustyn Gibson
Browse files
Options
Downloads
Patches
Plain Diff
Change some errors to warnings in updater, when commit is newer than master or network unavailable
parent
c31ba033
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
sickbeard/versionChecker.py
+5
-5
5 additions, 5 deletions
sickbeard/versionChecker.py
with
5 additions
and
5 deletions
sickbeard/versionChecker.py
+
5
−
5
View file @
029dd7bf
...
@@ -358,7 +358,7 @@ class GitUpdateManager(UpdateManager):
...
@@ -358,7 +358,7 @@ class GitUpdateManager(UpdateManager):
output
=
err
=
exit_status
=
None
output
=
err
=
exit_status
=
None
if
not
git_path
:
if
not
git_path
:
logger
.
log
(
u
"
No git specified, can
'
t use git commands
"
,
logger
.
ERROR
)
logger
.
log
(
u
"
No git specified, can
'
t use git commands
"
,
logger
.
WARNING
)
exit_status
=
1
exit_status
=
1
return
(
output
,
err
,
exit_status
)
return
(
output
,
err
,
exit_status
)
...
@@ -490,7 +490,7 @@ class GitUpdateManager(UpdateManager):
...
@@ -490,7 +490,7 @@ class GitUpdateManager(UpdateManager):
sickbeard
.
NEWEST_VERSION_STRING
=
None
sickbeard
.
NEWEST_VERSION_STRING
=
None
if
self
.
_num_commits_ahead
:
if
self
.
_num_commits_ahead
:
logger
.
log
(
u
"
Local branch is ahead of
"
+
self
.
branch
+
"
. Automatic update not possible.
"
,
logger
.
ERROR
)
logger
.
log
(
u
"
Local branch is ahead of
"
+
self
.
branch
+
"
. Automatic update not possible.
"
,
logger
.
WARNING
)
newest_text
=
"
Local branch is ahead of
"
+
self
.
branch
+
"
. Automatic update not possible.
"
newest_text
=
"
Local branch is ahead of
"
+
self
.
branch
+
"
. Automatic update not possible.
"
elif
self
.
_num_commits_behind
>
0
:
elif
self
.
_num_commits_behind
>
0
:
...
@@ -525,7 +525,7 @@ class GitUpdateManager(UpdateManager):
...
@@ -525,7 +525,7 @@ class GitUpdateManager(UpdateManager):
try
:
try
:
self
.
_check_github_for_update
()
self
.
_check_github_for_update
()
except
Exception
,
e
:
except
Exception
,
e
:
logger
.
log
(
u
"
Unable to contact github, can
'
t check for update:
"
+
repr
(
e
),
logger
.
ERROR
)
logger
.
log
(
u
"
Unable to contact github, can
'
t check for update:
"
+
repr
(
e
),
logger
.
WARNING
)
return
False
return
False
if
self
.
_num_commits_behind
>
0
:
if
self
.
_num_commits_behind
>
0
:
...
@@ -619,7 +619,7 @@ class SourceUpdateManager(UpdateManager):
...
@@ -619,7 +619,7 @@ class SourceUpdateManager(UpdateManager):
try
:
try
:
self
.
_check_github_for_update
()
self
.
_check_github_for_update
()
except
Exception
,
e
:
except
Exception
,
e
:
logger
.
log
(
u
"
Unable to contact github, can
'
t check for update:
"
+
repr
(
e
),
logger
.
ERROR
)
logger
.
log
(
u
"
Unable to contact github, can
'
t check for update:
"
+
repr
(
e
),
logger
.
WARNING
)
return
False
return
False
if
self
.
branch
!=
self
.
_find_installed_branch
():
if
self
.
branch
!=
self
.
_find_installed_branch
():
...
@@ -719,7 +719,7 @@ class SourceUpdateManager(UpdateManager):
...
@@ -719,7 +719,7 @@ class SourceUpdateManager(UpdateManager):
urllib
.
urlretrieve
(
tar_download_url
,
tar_download_path
)
urllib
.
urlretrieve
(
tar_download_url
,
tar_download_path
)
if
not
ek
.
ek
(
os
.
path
.
isfile
,
tar_download_path
):
if
not
ek
.
ek
(
os
.
path
.
isfile
,
tar_download_path
):
logger
.
log
(
u
"
Unable to retrieve new version from
"
+
tar_download_url
+
"
, can
'
t update
"
,
logger
.
ERROR
)
logger
.
log
(
u
"
Unable to retrieve new version from
"
+
tar_download_url
+
"
, can
'
t update
"
,
logger
.
WARNING
)
return
False
return
False
if
not
ek
.
ek
(
tarfile
.
is_tarfile
,
tar_download_path
):
if
not
ek
.
ek
(
tarfile
.
is_tarfile
,
tar_download_path
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment