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 DCD7C1381F3 for ; Tue, 25 Jun 2013 03:29:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C2C9E08ED; Tue, 25 Jun 2013 03:29:32 +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 32748E08ED for ; Tue, 25 Jun 2013 03:29:32 +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 4591533E6D9 for ; Tue, 25 Jun 2013 03:29:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DD692E468F for ; Tue, 25 Jun 2013 03:29:29 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1372130950.589ba5a84f6cdd7a71c94e378c61a4d5f39932be.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 589ba5a84f6cdd7a71c94e378c61a4d5f39932be X-VCS-Branch: master Date: Tue, 25 Jun 2013 03:29:29 +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: 0b17a44b-fbd7-4bef-9e80-3822310093c0 X-Archives-Hash: 6e42c84a41e7e493928429e005b7a8b5 commit: 589ba5a84f6cdd7a71c94e378c61a4d5f39932be Author: Zac Medico gentoo org> AuthorDate: Tue Jun 25 03:29:10 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Jun 25 03:29:10 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=589ba5a8 repoman: dedent generated repos.conf This fixes a "File contains no section headers" error raised by configparser with Python 2. --- bin/repoman | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/repoman b/bin/repoman index 6107449..2a3b4f3 100755 --- a/bin/repoman +++ b/bin/repoman @@ -590,10 +590,10 @@ except KeyError: if layout_conf_data['repo-name']: repo_name = layout_conf_data['repo-name'] repos_conf_file = os.path.join(repoman_settings["PORTAGE_CONFIGROOT"], portage.const.USER_CONFIG_PATH, "repos.conf") - tmp_conf_file = io.StringIO(""" + tmp_conf_file = io.StringIO(textwrap.dedent(""" [%s] location = %s - """ % (repo_name, portdir_overlay)) + """) % (repo_name, portdir_overlay)) repositories = portage.repository.config.RepoConfigLoader([repos_conf_file, tmp_conf_file], repoman_settings) # We have to call the config constructor again so that attributes # dependent on config.repositories are initialized correctly.