From 725305dd9c3c14e67c8f19017fd33856e53fa40d Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Sat, 4 Oct 2008 20:34:37 -1000 Subject: [PATCH] Correct typo and use os.path.join() in instroot.py. It's packages_files, not packages_file. --- src/pylorax/instroot.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pylorax/instroot.py b/src/pylorax/instroot.py index ff41c097..c3595e46 100644 --- a/src/pylorax/instroot.py +++ b/src/pylorax/instroot.py @@ -58,17 +58,17 @@ def createInstRoot(yumconf=None, arch=None, treedir=None, updates=None): libdir = 'lib' # the directory where the instroot will be created - destdir = treedir + '/install' + destdir = os.path.join(treedir, 'install') os.makedirs(destdir) # build a list of packages to install packages = set() packages_files = [] - packages_files.append(pylorax.conf['confdir'] + '/packages') - packages_files.append(pylorax.conf['confdir'] + '/' + arch + '/packages') + packages_files.append(os.path.join(pylorax.conf['confdir'], 'packages')) + packages_files.append(os.path.join(pylorax.conf['confdir'], arch, 'packages')) - for pfile in packages_file: + for pfile in packages_files: if os.path.isfile(pfile): f = open(pfile, 'r') for line in f.readlines():