summaryrefslogtreecommitdiffstats
path: root/BuildManager
diff options
context:
space:
mode:
authordaviddavid <geiger.david68210@gmail.com>2024-02-12 19:16:32 +0100
committerdaviddavid <geiger.david68210@gmail.com>2024-02-12 19:16:32 +0100
commit7ac3b0ede501838d0bba3ee80fa005312addb53e (patch)
tree21a8141438a4be5dc592c38aeb2a47d23984f94f /BuildManager
parent23ce51cf774a24cafd46a9a5896e54f45c42de35 (diff)
downloadbm-7ac3b0ede501838d0bba3ee80fa005312addb53e.tar
bm-7ac3b0ede501838d0bba3ee80fa005312addb53e.tar.gz
bm-7ac3b0ede501838d0bba3ee80fa005312addb53e.tar.bz2
bm-7ac3b0ede501838d0bba3ee80fa005312addb53e.tar.xz
bm-7ac3b0ede501838d0bba3ee80fa005312addb53e.zip
Release 3.53.5
- remove trailing spaces - fix bash-completion location
Diffstat (limited to 'BuildManager')
-rw-r--r--BuildManager/fileutil.py12
-rw-r--r--BuildManager/package.py12
2 files changed, 12 insertions, 12 deletions
diff --git a/BuildManager/fileutil.py b/BuildManager/fileutil.py
index 05126da..d045321 100644
--- a/BuildManager/fileutil.py
+++ b/BuildManager/fileutil.py
@@ -28,20 +28,20 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
except os.error as e:
(errno, errstr) = e.args
raise Error("could not open %s: %s" % (src, errstr))
-
+
try:
fdst = open(dst, 'wb')
except os.error as e:
(errno, errstr) = e.args
raise Error("could not create %s: %s" % (dst, errstr))
-
+
while 1:
try:
buf = fsrc.read(buffer_size)
except os.error as e:
(errno, errstr) = e.args
raise Error("could not read from %s: %s" % (src, errstr))
-
+
if not buf:
break
@@ -50,7 +50,7 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
except os.error as e:
(errno, errstr) = e.args
raise Error("could not write to %s: %s" % (dst, errstr))
-
+
finally:
if fdst:
fdst.close()
@@ -101,7 +101,7 @@ def copy_file (src, dst, preserve_mode=1, preserve_times=1, link=None,
logger.info("%s %s to %s" % (action, src, dir))
else:
logger.info("%s %s to %s" % (action, src, dst))
-
+
if dryrun:
return (dst, 1)
@@ -138,7 +138,7 @@ def move_file (src, dst, dryrun=False):
"""
from os.path import exists, isfile, isdir, basename, dirname
import errno
-
+
logger.info("moving %s to %s" % (src, dst))
if dryrun:
diff --git a/BuildManager/package.py b/BuildManager/package.py
index 1c88bd3..d324453 100644
--- a/BuildManager/package.py
+++ b/BuildManager/package.py
@@ -66,7 +66,7 @@ class _package:
if rc: return rc
return rpmVersionCompare(self.epoch, self.version, self.release,
pkg.epoch, pkg.version, pkg.release)
-
+
def _expand_log(self):
substdict = {"builddir":self.builddir,
"name":self.name,
@@ -94,7 +94,7 @@ class _package_spec(_package):
else:
ret.append(s[start:end+1])
return "".join(ret)
-
+
def _init(self):
self.spec = self.absfile
self.builddir = os.path.dirname(os.path.dirname(self.absfile))
@@ -170,7 +170,7 @@ class _package_rpm(_package):
if self.builddir:
self._expand_log()
return self._install_srpm()
-
+
def _builddir_create(self, unpackdir):
unpackdir = os.path.abspath(unpackdir)
builddir = "%s/%s-%s-%s-topdir" % (unpackdir, self.name, self.version, self.release)
@@ -179,7 +179,7 @@ class _package_rpm(_package):
raise BuildManagerPackageError("error creating builddir at %s" % builddir)
else:
return builddir
-
+
def _install_srpm(self):
cmd = "rpm -i --define '_topdir %s' %s &> %s"%(self.builddir,self.file,self.log)
status, output = subprocess.getstatusoutput(cmd)
@@ -217,7 +217,7 @@ class PackageList(UserList):
and mypkg <= pkg:
return 1
return 0
-
+
def has_eq(self, pkg):
for mypkg in self.data:
if mypkg.name == pkg.name \
@@ -225,7 +225,7 @@ class PackageList(UserList):
and mypkg == pkg:
return 1
return 0
-
+
def has_ge(self, pkg):
for mypkg in self.data:
if mypkg.name == pkg.name \