From 0f23668367d8406e164eb7001cf746b2c3b1f663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Wed, 3 Aug 2005 17:58:21 +0000 Subject: [PATCH] TYPO corrected, no need to intermediate variables like host, flags = glb.flags removed --- pisi/actionsapi/get.py | 1 - pisi/actionsapi/variables.py | 12 +++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pisi/actionsapi/get.py b/pisi/actionsapi/get.py index 504d8165..5503c66e 100644 --- a/pisi/actionsapi/get.py +++ b/pisi/actionsapi/get.py @@ -19,7 +19,6 @@ from variables import glb env = glb.env dirs = glb.dirs -flags = glb.flags def pkgDIR(): return env.pkg_dir diff --git a/pisi/actionsapi/variables.py b/pisi/actionsapi/variables.py index e162707b..91196a83 100644 --- a/pisi/actionsapi/variables.py +++ b/pisi/actionsapi/variables.py @@ -26,17 +26,16 @@ def exportFlags(): # Build systems depend on these environment variables. That is why # we export them instead of using as (instance) variables. values = pisi.config.config.values - environ['HOST'] = host = values.build.host - environ['CFLAGS'] = cflags = values.build.cflags - environ['CXXFLAGS'] = cxxflags = values.build.cxxflags - environ['LDFLAGS'] = ldflags = values.build.ldflags - + environ['HOST'] = values.build.host + environ['CFLAGS'] = values.build.cflags + environ['CXXFLAGS'] = values.build.cxxflags + environ['LDFLAGS'] = values.build.ldflags class Env(object): '''General environment variables used in actions API''' def __init__(self): - setFlags() + exportFlags() self.__vars = { 'pkg_dir': 'PKG_DIR', @@ -73,7 +72,6 @@ class Dirs: localstate = 'var/lib' defaultprefix = 'usr' - class Variables(pisi.config.Config): const = pisi.constants.const env = Env()