diff --git a/slpkg/__metadata__.py b/slpkg/__metadata__.py index f761e764..a5e8ac12 100644 --- a/slpkg/__metadata__.py +++ b/slpkg/__metadata__.py @@ -87,7 +87,7 @@ class MetaData(object): __all__ = "slpkg" __author__ = "dslackw" - __version_info__ = (2, 6, 9) + __version_info__ = (2, 7, 0) __version__ = "{0}.{1}.{2}".format(*__version_info__) __license__ = "GNU General Public License v3 (GPLv3)" __email__ = "d.zlatanidis@gmail.com" diff --git a/slpkg/pkg/manager.py b/slpkg/pkg/manager.py index 40fadf78..6cc4964d 100644 --- a/slpkg/pkg/manager.py +++ b/slpkg/pkg/manager.py @@ -96,7 +96,7 @@ class PackageManager(object): remove_pkg = raw_input( "\nAre you sure to remove {0} {1} [y/N]? ".format( str(len(self.removed)), msg)) - except KeyboardInterrupt: + except (KeyboardInterrupt, EOFError): print("") # new line at exit raise SystemExit() if remove_pkg in ["y", "Y"]: @@ -128,7 +128,7 @@ class PackageManager(object): "\nRemove dependencies (maybe used by " "other packages) [y/N]? ") print("") - except KeyboardInterrupt: + except (KeyboardInterrupt, EOFError): print("") # new line at exit raise SystemExit() return remove_dep @@ -207,7 +207,7 @@ class PackageManager(object): Msg().template(78) try: self.skip = raw_input(" > ").split() - except KeyboardInterrupt: + except (KeyboardInterrupt, EOFError): print("") raise SystemExit() for s in self.skip: @@ -345,7 +345,7 @@ class PackageManager(object): else: print(pkg) print("") # new line at end - except KeyboardInterrupt: + except (KeyboardInterrupt, EOFError): print("") # new line at exit raise SystemExit() diff --git a/slpkg/slack/patches.py b/slpkg/slack/patches.py index 9b2aa286..b55c6e7f 100644 --- a/slpkg/slack/patches.py +++ b/slpkg/slack/patches.py @@ -212,8 +212,12 @@ class Patches(object): "***{1}".format(self.meta.color["RED"], self.meta.color["ENDC"])) Msg().template(78) - answer = raw_input("\nThe kernel has been upgraded, " - "reinstall `LILO` [y/N]? ") + try: + answer = raw_input("\nThe kernel has been upgraded, " + "reinstall `LILO` [y/N]? ") + except (KeyboardInterrupt, EOFError): + print("") + raise SystemExit() if answer in ["y", "Y"]: subprocess.call("lilo", shell=True) break diff --git a/slpkg/slpkg_update.py b/slpkg/slpkg_update.py index 15bd638f..871c9b77 100644 --- a/slpkg/slpkg_update.py +++ b/slpkg/slpkg_update.py @@ -57,7 +57,11 @@ def it_self_update(): else: print("\nNew version '{0}-{1}' is available !\n".format( _meta_.__all__, __new_version__)) - answer = raw_input("Would you like to upgrade [y/N]? ") + try: + answer = raw_input("Would you like to upgrade [y/N]? ") + except (KeyboardInterrupt, EOFError): + print("") + raise SystemExit() if answer in ["y", "Y"]: print("") # new line after answer else: