From 00e7d48e1bb5bb95b33ba951e6a34adbb8769836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 10 Oct 2005 06:14:14 +0000 Subject: [PATCH] =?UTF-8?q?=20=20=20=20*=20get=20art=C4=B1k=20curKERNEL()?= =?UTF-8?q?=20isimli=20bir=20fonksiyona=20sahip,=20i=C5=9Flevi=20az=20sonr?= =?UTF-8?q?a,=20=20=20=20=20*=20Exception'lar=20Bar=C4=B1=C5=9F'=C4=B1n=20?= =?UTF-8?q?=C3=B6nerdi=C4=9Fi=20bi=C3=A7ime=20getirildi,=20=20=20=20=20*?= =?UTF-8?q?=20Kozmetik=20de=C4=9Fi=C5=9Fiklikler...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pisi/actionsapi/autotools.py | 8 +++---- pisi/actionsapi/coreutils.py | 8 +++++-- pisi/actionsapi/get.py | 34 +++++++++++++++++++++++---- pisi/actionsapi/kde.py | 21 +++++++++++------ pisi/actionsapi/libtools.py | 5 +--- pisi/actionsapi/perlmodules.py | 4 +++- pisi/actionsapi/pisitoolsfunctions.py | 4 ++-- pisi/actionsapi/scons.py | 5 ++-- pisi/actionsapi/variables.py | 3 ++- 9 files changed, 64 insertions(+), 28 deletions(-) diff --git a/pisi/actionsapi/autotools.py b/pisi/actionsapi/autotools.py index cabcb1fc..a9b6c423 100644 --- a/pisi/actionsapi/autotools.py +++ b/pisi/actionsapi/autotools.py @@ -28,7 +28,7 @@ from pisi.actionsapi.shelltools import can_access_file from pisi.actionsapi.libtools import gnuconfig_update class ConfigureError(pisi.actionsapi.Error): - def __init__(self, value): + def __init__(self, value=''): pisi.actionsapi.Error.__init__(self, value) self.value = value ctx.ui.error(value) @@ -36,19 +36,19 @@ class ConfigureError(pisi.actionsapi.Error): ctx.ui.error(_('Please attach the config.log to your bug report:\n%s/config.log') % os.getcwd()) class MakeError(pisi.actionsapi.Error): - def __init__(self, value): + def __init__(self, value=''): pisi.actionsapi.Error.__init__(self, value) self.value = value ctx.ui.error(value) class InstallError(pisi.actionsapi.Error): - def __init__(self, value): + def __init__(self, value=''): pisi.actionsapi.Error.__init__(self, value) self.value = value ctx.ui.error(value) class RunTimeError(pisi.actionsapi.Error): - def __init__(self, value): + def __init__(self, value=''): pisi.actionsapi.Error.__init__(self, value) self.value = value ctx.ui.error(value) diff --git a/pisi/actionsapi/coreutils.py b/pisi/actionsapi/coreutils.py index 3e52c340..83f8ede1 100644 --- a/pisi/actionsapi/coreutils.py +++ b/pisi/actionsapi/coreutils.py @@ -11,9 +11,13 @@ # Please read the COPYING file. # Standard Python Modules -import sys import re -from itertools import izip, imap, count, ifilter, ifilterfalse +import sys +from itertools import izip +from itertools import imap +from itertools import count +from itertools import ifilter +from itertools import ifilterfalse # ActionsAPI import pisi.actionsapi diff --git a/pisi/actionsapi/get.py b/pisi/actionsapi/get.py index f6346647..ecccc37d 100644 --- a/pisi/actionsapi/get.py +++ b/pisi/actionsapi/get.py @@ -25,28 +25,44 @@ import pisi.context as ctx from variables import glb class BinutilsError(pisi.actionsapi.Error): - pass + def __init__(self, value=''): + pisi.actionsapi.Error.__init__(self, value) + self.value = value + ctx.ui.error(value) +# Globals env = glb.env dirs = glb.dirs def curDIR(): + '''returns current work directory's path''' return os.getcwd() +def curKERNEL(): + '''returns currently running kernel's version''' + versionString = file("/proc/version").readline() + return versionString.split()[2] + def ENV(environ): + '''returns any given environ variable''' return os.environ[environ]; -# variables.Env +# PİSİ Related Functions def pkgDIR(): + '''returns the path of binary packages''' + '''Default: /var/cache/pisi/packages''' return env.pkg_dir def workDIR(): return env.work_dir def installDIR(): + '''returns the path of binary packages''' return env.install_dir +# PSPEC Related Functions + def srcNAME(): return env.src_name @@ -61,10 +77,17 @@ def srcTAG(): def srcDIR(): return env.src_name + '-' + env.src_version + +# Build Related Functions def HOST(): return env.host +def CHOST(): + # FIXME: Currently it behave same as HOST, + # but will be used for cross-compiling when PİSİ ready... + return env.host + def CFLAGS(): return env.cflags @@ -74,7 +97,7 @@ def CXXFLAGS(): def LDFLAGS(): return env.ldflags -# variables.Dirs +# Directory Related Functions def docDIR(): return dirs.doc @@ -101,12 +124,15 @@ def defaultprefixDIR(): return dirs.defaultprefix def kdeDIR(): + # FIXME: Get followings from env.d or somewhere else return dirs.kde def qtDIR(): + # FIXME: Get followings from env.d or somewhere else return dirs.qt def qtLIBDIR(): + # FIXME: Get followings from env.d or somewhere else return '%s/lib/' % qtDIR() # Binutils Variables @@ -115,7 +141,7 @@ def existBinary(bin): # determine if path has binary path = os.environ['PATH'].split(':') for directory in path: - if os.path.exists(os.path.join(directory, bin) ): + if os.path.exists(os.path.join(directory, bin)): return True return False diff --git a/pisi/actionsapi/kde.py b/pisi/actionsapi/kde.py index 696339f8..d394167a 100644 --- a/pisi/actionsapi/kde.py +++ b/pisi/actionsapi/kde.py @@ -23,21 +23,28 @@ import pisi.context as ctx # ActionsAPI Modules import pisi.actionsapi import pisi.actionsapi.get as get -from pisi.actionsapi.shelltools import system, can_access_file +from pisi.actionsapi.shelltools import system +from pisi.actionsapi.shelltools import can_access_file class ConfigureError(pisi.actionsapi.Error): - def __init__(self, Exception): - ctx.ui.error(Exception) + def __init__(self, value=''): + pisi.actionsapi.Error.__init__(self, value) + self.value = value + ctx.ui.error(value) if can_access_file('config.log'): ctx.ui.error(_('\n!!! Please attach the config.log to your bug report:\n%s/config.log') % os.getcwd()) class MakeError(pisi.actionsapi.Error): - def __init__(self, Exception): - ctx.ui.error(Exception) + def __init__(self, value=''): + pisi.actionsapi.Error.__init__(self, value) + self.value = value + ctx.ui.error(value) class InstallError(pisi.actionsapi.Error): - def __init__(self, Exception): - ctx.ui.error(Exception) + def __init__(self, value=''): + pisi.actionsapi.Error.__init__(self, value) + self.value = value + ctx.ui.error(value) def configure(parameters = ''): ''' parameters = '--with-nls --with-libusb --with-something-usefull ''' diff --git a/pisi/actionsapi/libtools.py b/pisi/actionsapi/libtools.py index c16d4c8c..fa7c83a8 100644 --- a/pisi/actionsapi/libtools.py +++ b/pisi/actionsapi/libtools.py @@ -26,7 +26,7 @@ from pisi.actionsapi.shelltools import * import pisi.actionsapi.get as get class RunTimeError(pisi.actionsapi.Error): - def __init__(self, value): + def __init__(self, value=''): pisi.actionsapi.Error.__init__(self, value) self.value = value ctx.ui.error(value) @@ -37,9 +37,6 @@ def preplib(sourceDirectory = '/usr/lib'): if system('/sbin/ldconfig -n -N %s' % sourceDirectory): raise RunTimeError(_('!!! Running ldconfig failed...')) -def preplib_so(sourceDirectory): - pass - def gnuconfig_update(): ''' copy newest config.* onto source\'s ''' for root, dirs, files in os.walk(os.getcwd()): diff --git a/pisi/actionsapi/perlmodules.py b/pisi/actionsapi/perlmodules.py index 0963d8d9..c2766be1 100644 --- a/pisi/actionsapi/perlmodules.py +++ b/pisi/actionsapi/perlmodules.py @@ -23,7 +23,9 @@ import pisi.context as ctx # ActionsAPI Modules import pisi.actionsapi import pisi.actionsapi.get as get -from pisi.actionsapi.shelltools import system, can_access_file, export +from pisi.actionsapi.shelltools import system +from pisi.actionsapi.shelltools import can_access_file +from pisi.actionsapi.shelltools import export class ConfigureError(pisi.actionsapi.Error): def __init__(self, value=''): diff --git a/pisi/actionsapi/pisitoolsfunctions.py b/pisi/actionsapi/pisitoolsfunctions.py index 8051a6bd..2b850e1c 100644 --- a/pisi/actionsapi/pisitoolsfunctions.py +++ b/pisi/actionsapi/pisitoolsfunctions.py @@ -28,13 +28,13 @@ import pisi.actionsapi from pisi.actionsapi.shelltools import * class FileError(pisi.actionsapi.Error): - def __init__(self, value): + def __init__(self, value=''): pisi.actionsapi.Error.__init__(self, value) self.value = value ctx.ui.error(value) class ArgumentError(pisi.actionsapi.Error): - def __init__(self, value): + def __init__(self, value=''): pisi.actionsapi.Error.__init__(self, value) self.value = value ctx.ui.error(value) diff --git a/pisi/actionsapi/scons.py b/pisi/actionsapi/scons.py index 4781a301..9c3e75db 100644 --- a/pisi/actionsapi/scons.py +++ b/pisi/actionsapi/scons.py @@ -23,15 +23,14 @@ import pisi.actionsapi import pisi.actionsapi.get as get from pisi.actionsapi.shelltools import system - class MakeError(pisi.actionsapi.Error): - def __init__(self, value): + def __init__(self, value=''): pisi.actionsapi.Error.__init__(self, value) self.value = value ctx.ui.error(value) class InstallError(pisi.actionsapi.Error): - def __init__(self, value): + def __init__(self, value=''): pisi.actionsapi.Error.__init__(self, value) self.value = value ctx.ui.error(value) diff --git a/pisi/actionsapi/variables.py b/pisi/actionsapi/variables.py index 7d3eb5ea..f007e04c 100644 --- a/pisi/actionsapi/variables.py +++ b/pisi/actionsapi/variables.py @@ -11,7 +11,8 @@ # Please read the COPYING file. # Standard Python Modules -from os import getenv, environ +from os import getenv +from os import environ # Pisi-Core Modules import pisi.context as ctx