From 45374e3b1bd9f8053b0d477b0707c810914233cc Mon Sep 17 00:00:00 2001 From: Javinator9889 Date: Fri, 18 May 2018 09:26:46 +0200 Subject: [PATCH] Version 1.18.4 - bug while deleting downloaded files - using shutils instead of subprocess --- README.md | 2 +- README.rst | 2 +- kernel_upgrader/utils/__init__.py | 18 +++++++++--------- kernel_upgrader/values/Constants.py | 3 +-- version.json | Bin 34 -> 34 bytes 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 29edc2f..fc28b48 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A Python tool for upgrade your kernel safely from https://kernel.org -[![PyPi](https://img.shields.io/badge/v1.18.3%20-PyPi-green.svg)](https://pypi.org/project/KernelUpgrader/) +[![PyPi](https://img.shields.io/badge/v1.18.4%20-PyPi-green.svg)](https://pypi.org/project/KernelUpgrader/) [![ZIP](https://img.shields.io/badge/Package%20-Zip-green.svg)](https://github.com/Javinator9889/KernelUpgrader/archive/master.zip) [![GIT](https://img.shields.io/badge/Package%20-Git-green.svg)](https://github.com/Javinator9889/KernelUpgrader.git) diff --git a/README.rst b/README.rst index 71de464..bd35cf3 100644 --- a/README.rst +++ b/README.rst @@ -3,7 +3,7 @@ KernelUpgrader A Python tool for upgrade your kernel safely from https://kernel.org -.. image :: https://img.shields.io/badge/v1.18.3%20-PyPi-green.svg +.. image :: https://img.shields.io/badge/v1.18.4%20-PyPi-green.svg :target: https://pypi.org/project/KernelUpgrader/ :alt: PyPi .. image :: https://img.shields.io/badge/Package%20-Zip-green.svg diff --git a/kernel_upgrader/utils/__init__.py b/kernel_upgrader/utils/__init__.py index 443b67d..4ab6551 100644 --- a/kernel_upgrader/utils/__init__.py +++ b/kernel_upgrader/utils/__init__.py @@ -122,20 +122,20 @@ def isRunningInBackground(): def cleanupSpace(): - import subprocess import logging - from kernel_upgrader.values.Constants import C_CLEAN_DOWNLOADS, LOG_KERNEL + import shutil + from kernel_upgrader.values.Constants import LOG_KERNEL from kernel_upgrader.utils.colors import OutputColors as Colors - command = C_CLEAN_DOWNLOADS.format(getHomeDir() + "/*") - clean_process = subprocess.Popen(command.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE) - clean_process.communicate() - return_code = clean_process.returncode - if return_code != 0: + try: + shutil.rmtree(getHomeDir(), ignore_errors=True) + except OSError as e: log = logging.getLogger(LOG_KERNEL) - log.error("There was an error while trying to clean data in \"" + getHomeDir() + "\"") + log.error("There was an error while trying to clean data in \"" + getHomeDir() + "\". More info: " + str(e)) raise RuntimeError(Colors.FAIL + "We were not able to clean data in \"" + getHomeDir() + "\". Please, clean it" - " up manually" + " up manually.\n" + "More info available " + "on logs" + Colors.ENDC) diff --git a/kernel_upgrader/values/Constants.py b/kernel_upgrader/values/Constants.py index 821c5ab..d33f5b8 100644 --- a/kernel_upgrader/values/Constants.py +++ b/kernel_upgrader/values/Constants.py @@ -16,7 +16,6 @@ C_CLEAN_KERNELS = "dpkg -l 'linux-*' | sed '/^ii/!d;/'\"$(uname -r " \ "| sed \"s/\(.*\)-\([^0-9]\+\)/\1/\")\"'/d;s/^[^ ]* [^ ]* \([^ ]*\).*/\1/;/[0-9]/!d' " \ "| xargs apt-get -y purge" -C_CLEAN_DOWNLOADS = "rm -r {}" # Log params LOG_KERNEL = "kernel_logging" @@ -38,7 +37,7 @@ # Other params OP_REPO_URL = "https://goo.gl/ZJ4zP9" -OP_VERSION = "1.18.3" +OP_VERSION = "1.18.4" OP_VERSION_RAW = "https://github.com/Javinator9889/KernelUpgrader/raw/master/version.json" # Program extended usage diff --git a/version.json b/version.json index 73a3cf1dcf33cfa7f9dec596e17e9ffccbb7a59e..982705c4953b8730d7fbddafbf5d3232c98f8c52 100644 GIT binary patch delta 9 QcmY#VnjptwGNo7#01Bf5U;qFB delta 9 QcmY#VnjptwJf&C<01BT1UjP6A