From f8960360ebca8ae85b91e24047afc21f6eda33bb Mon Sep 17 00:00:00 2001 From: Paul Varner Date: Wed, 20 May 2009 21:46:46 +0000 Subject: Change behaviour of getMinUpgrade This allows to differentiate between situations where the system is unaffected and unexistance of an upgrade path. Previously, the glsa-check would treat GLSAs that had no upgrade path (such as mask glsas) as not affecting the system. svn path=/trunk/gentoolkit/; revision=647 http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=ef38a394c5c2f5901173a53914705730850f9b3f --- bin/glsa-check | 10 ++++++++++ 1 file changed, 10 insertions(+) mode change 100755 => 100644 bin/glsa-check (limited to 'bin') diff --git a/bin/glsa-check b/bin/glsa-check old mode 100755 new mode 100644 index 0e2b7a3d4..969ad84fb --- a/bin/glsa-check +++ b/bin/glsa-check @@ -207,6 +207,11 @@ if mode in ["dump", "fix", "inject", "pretend"]: elif mode == "fix": sys.stdout.write("fixing "+myid+"\n") mergelist = myglsa.getMergeList(least_change=least_change) + if mergelist == None: + sys.stdout.write(">>> no vulnerable packages installed\n") + elif mergelist == []: + sys.stdout.write(">>> cannot fix GLSA, no unaffected packages available\n") + sys.exit(2) for pkg in mergelist: sys.stdout.write(">>> merging "+pkg+"\n") # using emerge for the actual merging as it contains the dependency @@ -225,6 +230,11 @@ if mode in ["dump", "fix", "inject", "pretend"]: elif mode == "pretend": sys.stdout.write("Checking GLSA "+myid+"\n") mergelist = myglsa.getMergeList(least_change=least_change) + if mergelist == None: + sys.stdout.write(">>> no vulnerable packages installed\n") + elif mergelist == []: + sys.stdout.write(">>> cannot fix GLSA, no unaffected packages available\n") + sys.exit(2) if mergelist: sys.stdout.write("The following updates will be performed for this GLSA:\n") for pkg in mergelist: -- cgit v1.2.3-1-g7c22