From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EF8951381F3 for ; Sat, 1 Dec 2012 23:12:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CFDE421C046; Sat, 1 Dec 2012 23:12:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 55FF521C046 for ; Sat, 1 Dec 2012 23:12:31 +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 5454933D8CA for ; Sat, 1 Dec 2012 23:12:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DDFB5E5436 for ; Sat, 1 Dec 2012 23:12:28 +0000 (UTC) From: "Magnus Granberg" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Magnus Granberg" Message-ID: <1354403534.81415947e93d59d2a5ea8163fc18a18f1cf4c389.zorry@gentoo> Subject: [gentoo-commits] dev/zorry:master commit in: gobs/pym/ X-VCS-Repository: dev/zorry X-VCS-Files: gobs/pym/package.py X-VCS-Directories: gobs/pym/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: 81415947e93d59d2a5ea8163fc18a18f1cf4c389 X-VCS-Branch: master Date: Sat, 1 Dec 2012 23:12:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d56f93db-90d4-4f57-90e9-edd98128e28d X-Archives-Hash: f8a8b2149d6ecc74ec883b6e1c5dbaf2 commit: 81415947e93d59d2a5ea8163fc18a18f1cf4c389 Author: Magnus Granberg gentoo org> AuthorDate: Sat Dec 1 23:12:14 2012 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Sat Dec 1 23:12:14 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=81415947 fix get_ebuild_cvs_revision in get_packageDict() --- gobs/pym/package.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gobs/pym/package.py b/gobs/pym/package.py index b8747bb..c960b07 100644 --- a/gobs/pym/package.py +++ b/gobs/pym/package.py @@ -3,7 +3,7 @@ import portage from gobs.flags import gobs_use_flags from gobs.repoman_gobs import gobs_repoman from gobs.manifest import gobs_manifest -from gobs.text import get_file_text, get_ebuild_text +from gobs.text import get_ebuild_cvs_revision from gobs.readconf import get_conf_settings from gobs.flags import gobs_use_flags reader=get_conf_settings() @@ -99,9 +99,9 @@ class gobs_package(object): add_gobs_logs(conn, log_msg, "info", config_profile) log_msg = "C %s:%s ... Fail." % (cpv, repo) add_gobs_logs(conn, log_msg, "info", config_profile) - ebuild_version_text_tree = '0' + ebuild_version_cvs_revision_tree = '0' else: - ebuild_version_text_tree = get_ebuild_text(pkgdir + "/" + package + "-" + ebuild_version_tree + ".ebuild") + ebuild_version_cvs_revision_tree = get_ebuild_cvs_revision(pkgdir + "/" + package + "-" + ebuild_version_tree + ".ebuild") # run repoman on the ebuild #init_repoman = gobs_repoman(self._mysettings, self._myportdb) @@ -128,7 +128,7 @@ class gobs_package(object): attDict['ebuild_version_checksum_tree']= ebuild_version_checksum_tree attDict['ebuild_version_metadata_tree'] = ebuild_version_metadata_tree #attDict['ebuild_version_text_tree'] = ebuild_version_text_tree[0] - attDict['ebuild_version_revision_tree'] = ebuild_version_text_tree[1] + attDict['ebuild_version_revision_tree'] = ebuild_version_cvs_revision_tree attDict['ebuild_error'] = repoman_error CM.putConnection(conn) return attDict