Private GIT

Skip to content
Snippets Groups Projects
Commit 5e4ae6a8 authored by Nic Wolfe's avatar Nic Wolfe
Browse files

Merge branch 'development' into dataTables

Conflicts:
	data/interfaces/default/inc_top.tmpl
parents ca65eb12 28be46a0
No related branches found
No related tags found
No related merge requests found
Showing
with 28 additions and 2 deletions
......@@ -9,6 +9,12 @@ autoProcessTV/autoProcessTV.cfg
server.crt
server.key
# SB Test Related #
######################
tests/Logs/*
tests/sickbeard.*
tests/cache.db
# Compiled source #
######################
*.py[co]
......
language: python
python:
- 2.5
- 2.6
- 2.7
# whitelist
branches:
only:
- development
- unittest
before_script: cd ./tests
script: ./all_tests.py
\ No newline at end of file
......@@ -51,7 +51,13 @@ def processEpisode(dirName, nzbName=None):
print "ERROR: You need an autoProcessTV.cfg file - did you rename and edit the .sample?"
sys.exit(-1)
config.read(configFilename)
try:
fp = open(configFilename, "r")
config.readfp(fp)
fp.close()
except IOError, e:
print "Could not read configuration file: ", str(e)
sys.exit(1)
host = config.get("SickBeard", "host")
port = config.get("SickBeard", "port")
......@@ -90,7 +96,7 @@ def processEpisode(dirName, nzbName=None):
urlObj = myOpener.openit(url)
except IOError, e:
print "Unable to open URL: ", str(e)
sys.exit()
sys.exit(1)
result = urlObj.readlines()
for line in result:
......
File moved
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment