From 52e6cb7df10a619d520385afb580a0c318ee991f Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Tue, 1 Mar 2016 01:34:09 -0500 Subject: [PATCH] Revert "Updating the import for results from buildbot" This reverts commit c2d22ba6ab6dd2c7c4d285652e6611199ff663eb. --- lib/gdbcommand.py | 2 +- lib/gdbgitdb.py | 2 +- master.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/gdbcommand.py b/lib/gdbcommand.py index 5286aac..ab6911e 100644 --- a/lib/gdbcommand.py +++ b/lib/gdbcommand.py @@ -1,6 +1,6 @@ # GDB .sum-fetching command. -from buildbot.process.results import SUCCESS, WARNINGS, FAILURE, EXCEPTION +from buildbot.status.builder import SUCCESS, WARNINGS, FAILURE, EXCEPTION from buildbot.steps.shell import ShellCommand from sumfiles import DejaResults, get_web_base from gdbgitdb import switch_to_branch diff --git a/lib/gdbgitdb.py b/lib/gdbgitdb.py index 08c1d27..46ea086 100644 --- a/lib/gdbgitdb.py +++ b/lib/gdbgitdb.py @@ -1,6 +1,6 @@ # DB-like with git -from buildbot.process.results import SUCCESS, WARNINGS, FAILURE, EXCEPTION +from buildbot.status.builder import SUCCESS, WARNINGS, FAILURE, EXCEPTION from buildbot.steps.shell import ShellCommand from sumfiles import get_web_base import os.path diff --git a/master.cfg b/master.cfg index 64f6be4..6b3f1e5 100644 --- a/master.cfg +++ b/master.cfg @@ -23,7 +23,7 @@ from buildbot.steps.source.git import Git from buildbot.steps.slave import RemoveDirectory from buildbot.changes.filter import ChangeFilter from buildbot.buildslave import BuildSlave -from buildbot.process.results import SUCCESS, WARNINGS, FAILURE, EXCEPTION +from buildbot.status.results import SUCCESS, WARNINGS, FAILURE, EXCEPTION from gdbcommand import CopyOldGDBSumFile, GdbCatSumfileCommand from gdbgitdb import SaveGDBResults, get_builder_commit_id from urllib import quote