Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug hunting baby...

Browse Source
This commit is contained in:
S.Çağlar Onur
2005-10-12 15:55:43 +00:00
parent f86d71f8d7
commit 5789423e21
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/install.py
+1
View File
@@ -33,6 +33,7 @@ import pisi.context as ctx
import pisi.packagedb as packagedb import pisi.packagedb as packagedb
import pisi.dependency as dependency import pisi.dependency as dependency
import pisi.operations as operations import pisi.operations as operations
import pisi.util as util
from pisi.specfile import * from pisi.specfile import *
from pisi.package import Package from pisi.package import Package
from pisi.metadata import MetaData from pisi.metadata import MetaData
pisi/util.py
+15 -10
View File
@@ -120,14 +120,14 @@ def remove_prefix(a,b):
def run_batch(cmd): def run_batch(cmd):
"""run command non-interactively and report return value and output""" """run command non-interactively and report return value and output"""
ui.info(_('running ') + cmd) ctx.ui.info(_('running ') + cmd)
a = os.popen(cmd) a = os.popen(cmd)
lines = a.readlines() lines = a.readlines()
ret = a.close() ret = a.close()
ui.debug(_('return value ') + ret) ctx.ui.debug(_('return value %s') % ret)
successful = ret == None successful = ret == None
if not successful: if not successful:
ui.error(_('Failed command: %s') % cmd + strlist(lines)) ctx.ui.error(_('Failed command: %s') % cmd + strlist(lines))
return (successful,lines) return (successful,lines)
def xterm_title(message): def xterm_title(message):
@@ -449,19 +449,24 @@ def package_name(name, version, release):
return name + '-' + version + '-' + release + ctx.const.package_prefix return name + '-' + version + '-' + release + ctx.const.package_prefix
def env_update(): def env_update():
if not os.path.exists("/etc/env.d"):
os.makedirs("/etc/env.d", 0755) env_dir = join_path(ctx.config.dest_dir(), "/etc/env.d")
profile_file = join_path(ctx.config.dest_dir(), "/etc/profile.env")
ldconf_file = join_path(ctx.config.dest_dir(), "/etc/ld.so.conf")
if not os.path.exists(env_dir):
os.makedirs(env_dir, 0755)
list = [] list = []
for file in os.listdir("/etc/env.d"): for file in os.listdir(env_dir):
if not os.path.isdir(os.path.join("/etc/env.d", file)): if not os.path.isdir(os.path.join(env_dir, file)):
list.append(file) list.append(file)
list.sort() list.sort()
keys = {} keys = {}
for file in list: for file in list:
f = open(os.path.join("/etc/env.d", file), "r") f = open(os.path.join(env_dir, file), "r")
for line in f: for line in f:
if not re.search("^#", line.strip()): if not re.search("^#", line.strip()):
currentLine = line.strip().split("=") currentLine = line.strip().split("=")
@@ -476,13 +481,13 @@ def env_update():
# generate profile.env # generate profile.env
keys["PATH"] += ":/bin/:/sbin/:/usr/bin/" keys["PATH"] += ":/bin/:/sbin/:/usr/bin/"
f = open("/etc/profile.env", "w") f = open(profile_file, "w")
for key in keys: for key in keys:
f.write("export %s=\"%s\"\n" % (key, keys[key])) f.write("export %s=\"%s\"\n" % (key, keys[key]))
f.close() f.close()
# generate ld.co.conf # generate ld.co.conf
f = open("/etc/ld.so.conf", "w") f = open(ldconf_file, "w")
for path in keys["LDPATH"].split(":"): for path in keys["LDPATH"].split(":"):
f.write("%s\n" % path) f.write("%s\n" % path)
f.close() f.close()