Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2025-01-05 11:02:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crach if exit with Esc key

Browse source
This commit is contained in:
Dimitris Zlatanidis 2015-09-15 08:16:06 +03:00
parent e36f29f660
commit 19052236c1
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
slpkg/dialog_box.py
View file

@ -62,7 +62,7 @@ class DialogUtil(object):
if code == "ok": if code == "ok":
self.unicode_to_string() self.unicode_to_string()
return self.ununicode return self.ununicode
if code == "cancel": if code in ["cancel", "esc"]:
self.exit() self.exit()
def buildlist(self, enabled): def buildlist(self, enabled):
@ -84,7 +84,7 @@ class DialogUtil(object):
if code == "ok": if code == "ok":
self.unicode_to_string() self.unicode_to_string()
return self.ununicode return self.ununicode
if code == "cancel": if code in ["cancel", "esc"]:
self.exit() self.exit()
def exit(self): def exit(self):

5
slpkg/repoenable.py
View file

@ -66,7 +66,10 @@ Keys: SPACE select or deselect the highlighted repositories,
text, title, backtitle, status = keys, "Repositories", "", False text, title, backtitle, status = keys, "Repositories", "", False
self.selected = DialogUtil(self.disabled, text, title, backtitle, self.selected = DialogUtil(self.disabled, text, title, backtitle,
status).buildlist(self.enabled) status).buildlist(self.enabled)
self.update_repos() if self.selected is not None:
self.update_repos()
else:
self.selected = self.enabled
self.clear_screen() self.clear_screen()
self.reference() self.reference()

4
slpkg/sbo/network.py
View file

@ -294,9 +294,11 @@ class SBoNetwork(object):
backtitle = "{0} {1}".format(_meta_.__all__, _meta_.__version__) backtitle = "{0} {1}".format(_meta_.__all__, _meta_.__version__)
status = False status = False
pkg = DialogUtil(data, text, title, backtitle, status).checklist() pkg = DialogUtil(data, text, title, backtitle, status).checklist()
if len(pkg) > 1: if pkg and len(pkg) > 1:
print("\nslpkg: error: choose only one package") print("\nslpkg: error: choose only one package")
raise SystemExit() raise SystemExit()
if pkg is None:
raise SystemExit()
self.name = "".join(pkg) self.name = "".join(pkg)
os.system("clear") os.system("clear")

1
slpkg/upgrade_checklist.py
View file

@ -47,6 +47,7 @@ def choose_upg(packages):
status = True status = True
pkgs = DialogUtil(data, text, title, backtitle, pkgs = DialogUtil(data, text, title, backtitle,
status).checklist() status).checklist()
pkgs = [] if pkgs is None else pkgs
for pkg in pkgs: for pkg in pkgs:
name = split_package(pkg)[0] name = split_package(pkg)[0]
if name in packages: if name in packages: