From 5d3f54e38210a42aeb88bfe320023fee965b519e Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Thu, 24 Sep 2015 13:55:10 +0300 Subject: [PATCH] Update interrupts --- ChangeLog.txt | 4 ++++ bin/slpkg | 9 +++++---- slpkg/interrupts.py | 32 -------------------------------- 3 files changed, 9 insertions(+), 36 deletions(-) delete mode 100644 slpkg/interrupts.py diff --git a/ChangeLog.txt b/ChangeLog.txt index 621abcf2..2ea1208d 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,7 @@ +2.9.4 - 24/09/2015 +Updated: +- KeyboardInterrupt for main.py + 2.9.3 - 23/09/2015 Added: - Default repositories file to allow editing urls diff --git a/bin/slpkg b/bin/slpkg index 2f64e265..60d6c35b 100755 --- a/bin/slpkg +++ b/bin/slpkg @@ -32,11 +32,12 @@ Slpkg is a user-friendly package manager for Slackware installations """ -import signal from slpkg.main import main -from slpkg.interrupts import signal_handler if __name__ == "__main__": - signal.signal(signal.SIGINT, signal_handler) - main() + try: + main() + except KeyboardInterrupt: + print("") + raise SystemExit() diff --git a/slpkg/interrupts.py b/slpkg/interrupts.py deleted file mode 100644 index 7ca78217..00000000 --- a/slpkg/interrupts.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- - -# interrupts.py file is part of slpkg. - -# Copyright 2014-2015 Dimitris Zlatanidis -# All rights reserved. - -# Slpkg is a user-friendly package manager for Slackware installations - -# https://github.com/dslackw/slpkg - -# Slpkg is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -import sys - - -def signal_handler(signal, frame): - """Handle keyboard interrupt ctrl+c - """ - print("") - sys.exit(0)