Skip to content
This repository has been archived by the owner on May 13, 2020. It is now read-only.

Commit

Permalink
fix some status msgs
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam Groszer committed Jun 16, 2010
1 parent a4143a6 commit 32dc494
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
10 changes: 5 additions & 5 deletions rackspace.ini
Expand Up @@ -24,11 +24,11 @@ command = call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\VCVARS
fileEnding = py2.6-win-amd64.egg


[ZODB3]
package = ZODB3
minVersion =
maxVersion =
targets = py24_32 py25_32
#[ZODB3]
#package = ZODB3
#minVersion =
#maxVersion =
#targets = py24_32 py25_32

[ZODB3_26]
package = ZODB3
Expand Down
9 changes: 6 additions & 3 deletions src/zope/wineggbuilder/build.py
Expand Up @@ -75,6 +75,7 @@ def build(self, package, version, files, sourceFolder, status):
if self.options.dryrun:
LOGGER.info("Dry run, no upload")
command = command.replace('upload', '')
status.setStatus(package, version, "dryrun", self)

LOGGER.debug('Running: %s\nIn: %s', command, sourceFolder)

Expand All @@ -91,6 +92,7 @@ def build(self, package, version, files, sourceFolder, status):
if 'failed' in output.lower():
LOGGER.info("Something was wrong with the command. Output: %s",
output)
status.setStatus(package, version, "failed", self)

if 'running upload' in output \
and 'Submitting' in output \
Expand All @@ -104,7 +106,7 @@ def build(self, package, version, files, sourceFolder, status):
#prepare for the worst
LOGGER.exception("An error occurred while running the build command")
#continue without bailing out
status.setStatus(package, version, "err", self)
status.setStatus(package, version, "error", self)

if tmpfile:
os.remove(tmpfile)
Expand Down Expand Up @@ -199,7 +201,7 @@ def build(self, status):
if needBuild:
needs.append(target)
else:
status.setStatus(self, version, "ex", target)
status.setStatus(self, version, "existed", target)

if needs:
tmpfolder = tempfile.mkdtemp('wineggbuilder')
Expand Down Expand Up @@ -303,7 +305,8 @@ def runCLI(self):

LOGGER.info('Done.')

status.log()
if self.options.status:
status.log()


def main(args=None):
Expand Down

0 comments on commit 32dc494

Please sign in to comment.