From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SQR2r-0008Q4-I9 for garchives@archives.gentoo.org; Fri, 04 May 2012 22:32:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61C23E06B4; Fri, 4 May 2012 22:32:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 32239E06B4 for ; Fri, 4 May 2012 22:32:05 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 973A51B4026 for ; Fri, 4 May 2012 22:32:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 54D13E5403 for ; Fri, 4 May 2012 22:32:03 +0000 (UTC) From: "Magnus Granberg" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Magnus Granberg" Message-ID: <1336170697.87c6c7bcd4add66a3e3aac0d7becc3ce267539fb.zorry@gentoo> Subject: [gentoo-commits] dev/zorry:master commit in: gobs/bin/, gobs/pym/ X-VCS-Repository: dev/zorry X-VCS-Files: gobs/bin/gobs_guest_jobs gobs/pym/build_log.py gobs/pym/build_queru.py X-VCS-Directories: gobs/bin/ gobs/pym/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: 87c6c7bcd4add66a3e3aac0d7becc3ce267539fb X-VCS-Branch: master Date: Fri, 4 May 2012 22:32:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 0db63df5-85b0-42f0-a789-dfaf57ec83e6 X-Archives-Hash: 8e240e83a825cc6645d77ed09b4ae35a commit: 87c6c7bcd4add66a3e3aac0d7becc3ce267539fb Author: Magnus Granberg gentoo org> AuthorDate: Fri May 4 22:31:37 2012 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Fri May 4 22:31:37 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/zorry.git;a=3D= commit;h=3D87c6c7bc fix the logfile location --- gobs/bin/gobs_guest_jobs | 2 +- gobs/pym/build_log.py | 4 +--- gobs/pym/build_queru.py | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gobs/bin/gobs_guest_jobs b/gobs/bin/gobs_guest_jobs index 6fd55ae..7c1fdeb 100755 --- a/gobs/bin/gobs_guest_jobs +++ b/gobs/bin/gobs_guest_jobs @@ -85,7 +85,7 @@ def main_loop(config_profile): logging.info("Job %s did fail. Config: %s", job[0], config_profile)= =09 repeat =3D False time.sleep(60) - CM.putConnection(conn) + CM.putConnection(conn) return =20 def main(): diff --git a/gobs/pym/build_log.py b/gobs/pym/build_log.py index 0e0f834..56fc029 100644 --- a/gobs/pym/build_log.py +++ b/gobs/pym/build_log.py @@ -548,9 +548,7 @@ class gobs_buildlog(object): if sum_build_log_list !=3D []: for sum_log_line in sum_build_log_list: summary_error =3D summary_error + " " + sum_log_line - # FIXME: use port_logdir in stead of the \/var\/log\/portage\/ string - logging.info("logdir: %s", settings.get("PORT_LOGDIR")) - build_log_dict['logfilename'] =3D re.sub("\/var\/log\/portage\/", "", = settings.get("PORTAGE_LOG_FILE")) + build_log_dict['logfilename'] =3D settings.get("PORTAGE_LOG_FILE").spl= it(self._config_profile)[1] logging.info("Logfile name: %s", settings.get("PORTAGE_LOG_FILE")) if build_dict['queue_id'] is None: build_id =3D self.add_new_ebuild_buildlog(settings, pkg, build_dict, = build_error, summary_error, build_log_dict) diff --git a/gobs/pym/build_queru.py b/gobs/pym/build_queru.py index 373bb8e..5ddcdf9 100644 --- a/gobs/pym/build_queru.py +++ b/gobs/pym/build_queru.py @@ -104,7 +104,7 @@ class queruaction(object): for sum_log_line in sum_build_log_list: summary_error =3D summary_error + " " + sum_log_line if settings.get("PORTAGE_LOG_FILE") is not None: - build_log_dict['logfilename'] =3D re.sub("\/var\/log\/portage\/", "= ", settings.get("PORTAGE_LOG_FILE")) + build_log_dict['logfilename'] =3D settings.get("PORTAGE_LOG_FILE").= split(self._config_profile)[1] os.chmod(settings.get("PORTAGE_LOG_FILE"), 0o224) else: build_log_dict['logfilename'] =3D ""