0
0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00

A different tack on the problems running makealldists.py under buildbot.

This commit is contained in:
Richard Kreuter 2010-04-15 09:39:30 -04:00
parent c74d5003d0
commit 9834129fda

View File

@ -114,7 +114,7 @@ def logfh(distro, distro_version, arch, mongo_version):
def spawn(distro, distro_version, arch, spec, directory, opts):
(mongo_version, suffix, pkg_version) = parse_mongo_version_spec(spec)
argv = ["makedist.py"] + opts + [ directory, distro, distro_version, arch ] + [ spec ]
argv = ["python", "makedist.py"] + opts + [ directory, distro, distro_version, arch ] + [ spec ]
# cmd = "mkdir -p %s; cd %s; touch foo.deb; echo %s %s %s %s %s | tee Packages " % ( directory, directory, directory, distro, distro_version, arch, mongo_version )
# print cmd
# argv = ["sh", "-c", cmd]
@ -141,10 +141,6 @@ def lose(name, logfh, losefh):
print >> losefh, "=== End loser %s ===" % name
def wait(procs, winfh, losefh, winners, losers):
# emit a blank line, so that the buildbot doesn't kill us off
# while waiting for output.
sys.stdout.write('.')
sys.stdout.flush()
try:
(pid, stat) = os.wait()
except OSError, err:
@ -181,6 +177,7 @@ def __main__():
repodir=tempfile.mkdtemp()
print "makedist output under: %s\nmerge directory: %s\ncombined repo: %s\n" % (outputroot, mergedir, repodir)
sys.stdout.flush()
# Add more dist/version/architecture tuples as they're supported.
dists = (("ubuntu", "10.4"),
("ubuntu", "9.10"),
@ -237,7 +234,7 @@ def __main__():
merge_directories_concatenating_conflicts(mergedir, glob.glob(outputroot+'/*'))
argv=["mergerepositories.py", mergedir, repodir]
argv=["python", "mergerepositories.py", mergedir, repodir]
print "running %s" % argv
print " ".join(argv)
r = subprocess.Popen(argv).wait()