Merge branch 'master' of github.com:lbryio/lbry

This commit is contained in:
Jimmy Kiselak 2015-11-11 15:06:31 -05:00
commit 6bf6e943cc

View file

@ -1706,7 +1706,7 @@ class Publish(CommandHandler):
self.console.sendLine(message % (str(self.file_name), str(self.publish_name), err.getErrorMessage()))
def _do_publish(self):
d = create_lbry_file(self.session, self.lbry_file_manager, self.file_name, open(self.file_name))
d = create_lbry_file(self.session, self.lbry_file_manager, self.file_name, open(self.file_path))
d.addCallback(self.add_to_lbry_files)
d.addCallback(lambda _: self._create_sd_blob())
d.addCallback(lambda _: self._claim_name())
@ -2396,4 +2396,4 @@ class BlockchainStatusFactory(CommandHandlerFactory):
control_handler_class = BlockchainStatus
command = "get-blockchain-status"
short_help = "Show whether this application has caught up with the LBC blockchain"
full_help = "Show whether this applications has caught up with the LBC blockchain"
full_help = "Show whether this applications has caught up with the LBC blockchain"