Merge branch 'communicator-multithreading-newline' into communicator-multithreading

master
Kevin Froman 2018-05-14 19:45:15 -05:00
commit 0f455b50c9
2 changed files with 6 additions and 3 deletions

View File

@ -489,8 +489,12 @@ class OnionrCommunicate:
for i in blockList: for i in blockList:
if len(i.strip()) == 0: if len(i.strip()) == 0:
continue continue
if self._utils.hasBlock(i): try:
continue if self._utils.hasBlock(i):
continue
except:
logger.warn('Invalid hash') # TODO: move below validate hash check below
pass
if i in self.ignoredHashes: if i in self.ignoredHashes:
continue continue

View File

@ -446,7 +446,6 @@ class OnionrUtils:
else: else:
logger.warn('Failed to verify hash for %s' % block) logger.warn('Failed to verify hash for %s' % block)
def progressBar(self, value = 0, endvalue = 100, width = None): def progressBar(self, value = 0, endvalue = 100, width = None):
''' '''
Outputs a progress bar with a percentage. Write \n after use. Outputs a progress bar with a percentage. Write \n after use.