diff options
Diffstat (limited to 'BuildManager/package.py')
| -rw-r--r-- | BuildManager/package.py | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/BuildManager/package.py b/BuildManager/package.py index 140562d..b9646a5 100644 --- a/BuildManager/package.py +++ b/BuildManager/package.py @@ -2,7 +2,6 @@ from BuildManager import * from BuildManager.rpmver import rpmVersionCompare from collections import UserList import subprocess -import string import os import re @@ -74,25 +73,25 @@ class _package: self.log = subst(self.log, substdict) class _package_spec(_package): - def _rpm_vars(self, str, vars): + def _rpm_vars(self, s, vars): end = -1 ret = [] while 1: - start = string.find(str, "%{", end+1) + start = s.find("%{", end+1) if start == -1: - ret.append(str[end+1:]) + ret.append(s[end+1:]) break - ret.append(str[end+1:start]) - end = string.find(str, "}", start) + ret.append(s[end+1:start]) + end = s.find("}", start) if end == -1: - ret.append(str[start:]) + ret.append(s[start:]) break - varname = str[start+2:end] + varname = s[start+2:end] if varname in vars: ret.append(vars[varname]) else: - ret.append(str[start:end+1]) - return string.join(ret,"") + ret.append(s[start:end+1]) + return "".join(ret) def _init(self): self.spec = self.absfile @@ -104,15 +103,15 @@ class _package_spec(_package): raise BuildManagerFileError("couldn't open spec file %s" % self.absfile) defines = {} for line in f.readlines(): - lowerline = string.lower(line) + lowerline = line.lower() if not self.name and lowerline[:5] == "name:": - self.name = self._rpm_vars(string.strip(line[5:]), defines) + self.name = self._rpm_vars((line[5:]).strip(), defines) elif not self.version and lowerline[:8] == "version:": - self.version = self._rpm_vars(string.strip(line[8:]), defines) + self.version = self._rpm_vars((line[8:]).strip(), defines) elif not self.release and lowerline[:8] == "release:": - self.release = self._rpm_vars(string.strip(line[8:]), defines) + self.release = self._rpm_vars((line[8:]).strip(), defines) elif lowerline[:7] == "%define": - token = string.split(line[7:]) + token = (line[7:]).split() if len(token) == 2: defines[token[0]] = self._rpm_vars(token[1], defines) if self.name and self.version and self.release: @@ -131,7 +130,7 @@ class _package_rpm(_package): if status != 0: raise BuildManagerPackageError("error querying rpm file %s" % self.file) else: - tokens = string.split(output, " ") + tokens = output.split(" ") if len(tokens) != 5: raise Error("unexpected output querying rpm file %s: %s" % \ (self.file, output)) |