release-engineering/tito
1
0
Fork 0
mirror of https://github.com/rpm-software-management/tito.git synced 2025-02-23 20:22:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove tabs and trailing whitespace. add whitespace between methods

Browse source
This commit is contained in:
jesus m. rodriguez 2012-09-20 10:09:05 -04:00
parent d601601f3d
commit c1a4eb0a62
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/tito/release.py
View file

@ -243,9 +243,9 @@ class RsyncReleaser(Releaser):
""" """
A releaser which will rsync from a remote host, build the desired packages, A releaser which will rsync from a remote host, build the desired packages,
plug them in, and upload to server. plug them in, and upload to server.
Building of the packages is done via mock. Building of the packages is done via mock.
WARNING: This will not work in all WARNING: This will not work in all
situations, depending on the current OS, and the mock target you situations, depending on the current OS, and the mock target you
are attempting to use. are attempting to use.
@ -301,6 +301,7 @@ class RsyncReleaser(Releaser):
self.rsync_location = rsync_location self.rsync_location = rsync_location
output = run_command("rsync -rlvz %s %s" % (rsync_location, self.temp_dir)) output = run_command("rsync -rlvz %s %s" % (rsync_location, self.temp_dir))
debug(output) debug(output)
def rsync_to_remote(self): def rsync_to_remote(self):
print("rsync: %s -> %s" % (self.rsync_location, self.rsync_location)) print("rsync: %s -> %s" % (self.rsync_location, self.rsync_location))
os.chdir(self.temp_dir) os.chdir(self.temp_dir)
@ -318,6 +319,7 @@ class RsyncReleaser(Releaser):
rmtree(self.temp_dir) rmtree(self.temp_dir)
else: else:
print("WARNING: leaving %s (--no-cleanup)" % self.temp_dir) print("WARNING: leaving %s (--no-cleanup)" % self.temp_dir)
def copy_files_to_temp_dir(self): def copy_files_to_temp_dir(self):
os.chdir(self.temp_dir) os.chdir(self.temp_dir)
@ -334,9 +336,11 @@ class RsyncReleaser(Releaser):
if artifact_type in self.filetypes: if artifact_type in self.filetypes:
copy(artifact, self.temp_dir) copy(artifact, self.temp_dir)
print("copy: %s > %s" % (artifact, self.temp_dir)) print("copy: %s > %s" % (artifact, self.temp_dir))
def process_packages(self): def process_packages(self):
""" no-op. This will be overloaded by a subclass if needed. """ """ no-op. This will be overloaded by a subclass if needed. """
pass pass
def cleanup(self): def cleanup(self):
""" No-op, we clean up during self.release() """ """ No-op, we clean up during self.release() """
pass pass
@ -356,9 +360,9 @@ class YumRepoReleaser(RsyncReleaser):
# Default list of packages to copy # Default list of packages to copy
filetypes = ['rpm' ] filetypes = ['rpm' ]
# By default run createrepo without any paramaters # By default run createrepo without any paramaters
createrepo_command = "createrepo ." createrepo_command = "createrepo ."
def _read_rpm_header(self, ts, new_rpm_path): def _read_rpm_header(self, ts, new_rpm_path):
""" """
@ -377,6 +381,7 @@ class YumRepoReleaser(RsyncReleaser):
output = run_command(self.createrepo_command) output = run_command(self.createrepo_command)
debug(output) debug(output)
self.prune_other_versions() self.prune_other_versions()
def prune_other_versions(self): def prune_other_versions(self):
""" """
Cleanout any other version of the package we just built. Cleanout any other version of the package we just built.
@ -389,10 +394,10 @@ class YumRepoReleaser(RsyncReleaser):
self.new_rpm_dep_sets = {} self.new_rpm_dep_sets = {}
for artifact in self.builder.artifacts: for artifact in self.builder.artifacts:
if artifact.endswith(".rpm") and not artifact.endswith(".src.rpm"): if artifact.endswith(".rpm") and not artifact.endswith(".src.rpm"):
try: try:
header = self._read_rpm_header(rpm_ts, artifact) header = self._read_rpm_header(rpm_ts, artifact)
except rpm.error, e: except rpm.error, e:
continue continue
self.new_rpm_dep_sets[header['name']] = header.dsOfHeader() self.new_rpm_dep_sets[header['name']] = header.dsOfHeader()
# Now cleanout any other version of the package we just built, # Now cleanout any other version of the package we just built,
@ -406,7 +411,7 @@ class YumRepoReleaser(RsyncReleaser):
hdr = self._read_rpm_header(rpm_ts, full_path) hdr = self._read_rpm_header(rpm_ts, full_path)
except rpm.error, e: except rpm.error, e:
print "error reading rpm header in '%s': %s" % (full_path, e) print "error reading rpm header in '%s': %s" % (full_path, e)
continue continue
if hdr['name'] in self.new_rpm_dep_sets: if hdr['name'] in self.new_rpm_dep_sets:
dep_set = hdr.dsOfHeader() dep_set = hdr.dsOfHeader()
if dep_set.EVR() < self.new_rpm_dep_sets[hdr['name']].EVR(): if dep_set.EVR() < self.new_rpm_dep_sets[hdr['name']].EVR():