diff --git a/pisi/actionsapi/get.py b/pisi/actionsapi/get.py index 340beb9d..1ca89336 100644 --- a/pisi/actionsapi/get.py +++ b/pisi/actionsapi/get.py @@ -41,8 +41,7 @@ def curDIR(): def curKERNEL(): '''returns currently running kernel's version''' - versionString = file("/proc/version").readline() - return versionString.split()[2] + return os.uname[2] def curPYTHON(): ''' returns currently used python's version''' @@ -82,10 +81,10 @@ def srcRELEASE(): return env.src_release def srcTAG(): - return "%s-%s-%s" % (env.src_name, env.src_version, env.src_release) + return '%s-%s-%s' % (env.src_name, env.src_version, env.src_release) def srcDIR(): - return "%s-%s" % (env.src_name, env.src_version) + return '%s-%s' % (env.src_name, env.src_version) # Build Related Functions diff --git a/pisi/actionsapi/scons.py b/pisi/actionsapi/scons.py index e592bb8c..c64305d5 100644 --- a/pisi/actionsapi/scons.py +++ b/pisi/actionsapi/scons.py @@ -36,9 +36,9 @@ class InstallError(pisi.actionsapi.Error): ctx.ui.error(value) def make(parameters = ''): - if system("scons %s" % parameters): + if system('scons %s' % parameters): raise MakeError(_('Make failed.')) def install(parameters = 'install', prefix = get.installDIR()): - if system("scons prefix=%s %s" % (prefix, parameters)): + if system('scons prefix=%s %s' % (prefix, parameters)): raise InstallError(_('Install failed.')) diff --git a/pisi/actionsapi/shelltools.py b/pisi/actionsapi/shelltools.py index 12fb2aab..7e54f381 100644 --- a/pisi/actionsapi/shelltools.py +++ b/pisi/actionsapi/shelltools.py @@ -52,7 +52,7 @@ def makedirs(destinationDirectory): def echo(destionationFile, content): try: f = open(destionationFile, 'a') - f.write("%s\n" % content) + f.write('%s\n' % content) f.close() except IOError: error(_('ActionsAPI [echo]: Can\'t append to file %s.') % (destionationFile))