From ac0e95a53b5bdd759ba20b9291de747e665ae0bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Tue, 20 Mar 2018 23:25:02 +0100
Subject: [PATCH] Ignore packages with -generic in kernels listing.
---
kernels_cleaner.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/kernels_cleaner.py b/kernels_cleaner.py
index 315ea0a9..14466b2a 100755
--- a/kernels_cleaner.py
+++ b/kernels_cleaner.py
@@ -32,10 +32,10 @@ def clean_kernels():
log(RED + 'Failed to get sudo right.' + DEFAULT, error=True)
return 1
# list installed kernels
- p = subprocess.Popen('sudo dpkg --get-selections | grep linux', stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+ p = subprocess.Popen('sudo dpkg --get-selections| grep -v -- -generic | grep linux', stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
out, err = p.communicate()
- out = str(out, 'utf-8') if out else ''
- err = str(err, 'utf-8') if err else ''
+ out = out.decode('utf-8') if out else ''
+ err = err.decode('utf-8') if err else ''
if p.returncode != 0:
log(RED + 'Failed to list kernels.' + DEFAULT + '\nOut: ' + out + '\nErr: ' + err, error=True)
return 1
@@ -55,8 +55,8 @@ def clean_kernels():
# get current kernel
p = subprocess.Popen('uname -a', stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
out, err = p.communicate()
- out = str(out, 'utf-8') if out else ''
- err = str(err, 'utf-8') if err else ''
+ out = out.decode('utf-8') if out else ''
+ err = err.decode('utf-8') if err else ''
if p.returncode != 0:
log(RED + 'Failed to get current kernel.' + DEFAULT + '\nOut: ' + out + '\nErr: ' + err, error=True)
return 1
--
GitLab