From d800bd6175efc8bac249f23e824446628fa98e99 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Sat, 17 Nov 2007 21:54:57 +0000 Subject: use proper file name for kernel packages git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/trunk@1872 f8877401-5920-0410-a79b-8e2d7e04ca0d --- ChangeLog | 3 +++ src/GLIUtility.py | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5db57de..5dbe339 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ # Copyright 2005-2007 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 17 Nov 2007; Andrew Gaffney src/GLIUtility.py: + use proper file name for kernel packages + 17 Nov 2007; Andrew Gaffney src/fe/gtk/Networking.py: s/install_logger/install_logging_daemon/ diff --git a/src/GLIUtility.py b/src/GLIUtility.py index 13670ea..f04a7e8 100644 --- a/src/GLIUtility.py +++ b/src/GLIUtility.py @@ -919,11 +919,10 @@ def get_grp_pkgs_from_cd(): def get_kernpkgs_from_cd(): kernpkgs = {} try: - f_kernpkgs = open("/usr/livecd/kernpkgs.txt", "r") + for x in open("/usr/livecd/kernelpkgs.txt", "r").readline().strip().split(): + kernpkgs[x] = spawn(r"cat /var/db/pkg/" + x + r"-*/DESCRIPTION", return_output=True)[1].strip() except: - return - for x in f_kernpkgs: - kernpkgs[x] = spawn(r"cat /var/db/pkg/" + x + r"-*/DESCRIPTION", return_output=True)[1].strip() + pass return kernpkgs def get_keymaps(): -- cgit v1.2.3-65-gdbad