Disable broken :restart for now

This commit is contained in:
Florian Bruhin 2014-06-04 23:17:22 +02:00
parent da624d54c8
commit 30ce2c98e9
2 changed files with 27 additions and 25 deletions

2
BUGS
View File

@ -16,6 +16,8 @@ Bugs
- restart sometimes abort()s on QApplication __init__ (V155) - restart sometimes abort()s on QApplication __init__ (V155)
- restart is broken entirely since init refactoring (around af19e6d~1)
- qutebrowser :restart loops endlessly - qutebrowser :restart loops endlessly
We should refuse to do :restart when executing init commands We should refuse to do :restart when executing init commands

View File

@ -481,31 +481,31 @@ class Application(QApplication):
log.destroy.debug("maybe_quit quitting.") log.destroy.debug("maybe_quit quitting.")
self.quit() self.quit()
@cmdutils.register(instance='', nargs=0) #@cmdutils.register(instance='', nargs=0)
def restart(self, shutdown=True, pages=None): #def restart(self, shutdown=True, pages=None):
"""Restart qutebrowser while keeping existing tabs open.""" # """Restart qutebrowser while keeping existing tabs open."""
# We don't use _recover_pages here as it's too forgiving when # # We don't use _recover_pages here as it's too forgiving when
# exceptions occur. # # exceptions occur.
if pages is None: # if pages is None:
pages = [] # pages = []
for tab in self.mainwindow.tabs.widgets: # for tab in self.mainwindow.tabs.widgets:
url = tab.url().toString() # url = tab.url().toString()
if url: # if url:
pages.append(url) # pages.append(url)
pythonpath = os.pathsep.join(sys.path) # pythonpath = os.pathsep.join(sys.path)
os.environ['PYTHONPATH'] = pythonpath # os.environ['PYTHONPATH'] = pythonpath
argv = sys.argv[:] # argv = sys.argv[:]
for page in self._opened_urls: # for page in self._opened_urls:
try: # try:
argv.remove(page) # argv.remove(page)
except ValueError: # except ValueError:
pass # pass
argv = [sys.executable] + argv + pages # argv = [sys.executable] + argv + pages
log.procs.debug("Running {} with args {} (PYTHONPATH={})".format( # log.procs.debug("Running {} with args {} (PYTHONPATH={})".format(
sys.executable, argv, pythonpath)) # sys.executable, argv, pythonpath))
subprocess.Popen(argv) # subprocess.Popen(argv)
if shutdown: # if shutdown:
self.shutdown() # self.shutdown()
@cmdutils.register(instance='', split=False) @cmdutils.register(instance='', split=False)
def pyeval(self, s): def pyeval(self, s):