NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

urlfetcher: Add unconditional hasFile logging

Browse Source
This commit is contained in:
Cole Robinson 2016-03-24 14:51:36 -04:00
parent 1421772e4e
commit af5a86742c
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
virtinst/urlfetcher.py
View File

@ -132,11 +132,17 @@ class _URLFetcher(object):
""" """
pass pass
def _hasFile(self, url):
raise NotImplementedError("Must be implemented in subclass")
def hasFile(self, filename): def hasFile(self, filename):
""" """
Return True if self.location has the passed filename Return True if self.location has the passed filename
""" """
raise NotImplementedError("Must be implemented in subclass") url = self._make_full_url(filename)
ret = self._hasFile(url)
logging.debug("hasFile(%s) returning %s", url, ret)
return ret
def acquireFile(self, filename): def acquireFile(self, filename):
""" """
@ -167,16 +173,15 @@ class _URLFetcher(object):
class _HTTPURLFetcher(_URLFetcher): class _HTTPURLFetcher(_URLFetcher):
def hasFile(self, filename): def _hasFile(self, url):
""" """
We just do a HEAD request to see if the file exists We just do a HEAD request to see if the file exists
""" """
url = self._make_full_url(filename)
try: try:
response = requests.head(url) response = requests.head(url)
response.raise_for_status() response.raise_for_status()
except Exception, e: except Exception, e:
logging.debug("HTTP hasFile: didn't find %s: %s", url, str(e)) logging.debug("HTTP hasFile request failed: %s", str(e))
return False return False
return True return True
@ -241,8 +246,7 @@ class _FTPURLFetcher(_URLFetcher):
self._ftp = None self._ftp = None
def hasFile(self, filename): def _hasFile(self, url):
url = self._make_full_url(filename)
path = urlparse.urlparse(url)[2] path = urlparse.urlparse(url)[2]
try: try:
@ -264,12 +268,8 @@ class _LocalURLFetcher(_URLFetcher):
""" """
For grabbing files from a local directory For grabbing files from a local directory
""" """
def hasFile(self, filename): def _hasFile(self, url):
url = self._make_full_url(filename) return os.path.exists(url)
ret = os.path.exists(url)
if not ret:
logging.debug("local hasFile: Couldn't find %s", url)
return ret
def _grabber(self, url): def _grabber(self, url):
urlobj = file(url, "r") urlobj = file(url, "r")