moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-12-13 11:32:20 -05:00
Code Issues Releases Wiki Activity

Fix for issues relating to subprocess imports and BRANCH checks

Browse Source
This commit is contained in:
echel0n 2014-07-30 18:17:12 -07:00
parent b4efb2d641
commit 29b3f2ab3b
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sickbeard/versionChecker.py
View File

@ -35,8 +35,6 @@ from sickbeard import logger
from sickbeard.exceptions import ex from sickbeard.exceptions import ex
from sickbeard import encodingKludge as ek from sickbeard import encodingKludge as ek
from subprocess import check_output, PIPE, Popen
class CheckVersion(): class CheckVersion():
""" """
@ -769,12 +767,12 @@ class SourceUpdateManager(UpdateManager):
yield "040000 tree {}\t{}\0".format(sha1, d) yield "040000 tree {}\t{}\0".format(sha1, d)
def _mktree(self, files, dirs): def _mktree(self, files, dirs):
mkt = Popen(["git", "mktree", "-z"], stdin=PIPE, stdout=PIPE) mkt = subprocess.Popen(["git", "mktree", "-z"], stdin=subprocess.PIPE, stdout=subprocess.PIPE)
return mkt.communicate("".join(self._lstree(files, dirs)))[0].strip() return mkt.communicate("".join(self._lstree(files, dirs)))[0].strip()
def hash_file(self, path): def hash_file(self, path):
"""Write file at path to Git index, return its SHA1 as a string.""" """Write file at path to Git index, return its SHA1 as a string."""
return check_output(["git", "hash-object", "-w", "--", path]).strip() return subprocess.check_output(["git", "hash-object", "-w", "--", path]).strip()
def hash_dir(self, path): def hash_dir(self, path):
"""Write directory at path to Git index, return its SHA1 as a string.""" """Write directory at path to Git index, return its SHA1 as a string."""