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 E6FE8198005 for ; Sun, 17 Mar 2013 03:35:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 915A1E057F; Sun, 17 Mar 2013 03:35:10 +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 AA008E057F for ; Sun, 17 Mar 2013 03:35:09 +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 A1CEC33DB1D for ; Sun, 17 Mar 2013 03:35:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3347FE4079 for ; Sun, 17 Mar 2013 03:35:07 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" Message-ID: <1363490966.5ce4a445532de6cb0dba9dbf66e4916cf7e3a68a.arfrever@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/update.py X-VCS-Directories: pym/portage/ X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: 5ce4a445532de6cb0dba9dbf66e4916cf7e3a68a X-VCS-Branch: master Date: Sun, 17 Mar 2013 03:35:07 +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: 5f3080ed-9fe3-4693-88fb-c128799c9ca2 X-Archives-Hash: 9a51ad5c4d4754d6c99ad7025091abe6 commit: 5ce4a445532de6cb0dba9dbf66e4916cf7e3a68a Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Sun Mar 17 03:29:26 2013 +0000 Commit: Arfrever Frehtes Taifersar Arahesis gmail com> CommitDate: Sun Mar 17 03:29:26 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5ce4a445 portage.update.update_config_files(): Add handling of: /etc/portage/profile/packages /etc/portage/profile/package.use.force /etc/portage/profile/package.use.mask /etc/portage/profile/package.use.stable.force /etc/portage/profile/package.use.stable.mask --- pym/portage/update.py | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pym/portage/update.py b/pym/portage/update.py index 1b45a7a..6317d11 100644 --- a/pym/portage/update.py +++ b/pym/portage/update.py @@ -282,7 +282,7 @@ def parse_updates(mycontent): return myupd, errors def update_config_files(config_root, protect, protect_mask, update_iter, match_callback = None): - """Perform global updates on /etc/portage/package.*. + """Perform global updates on /etc/portage/package.*, /etc/portage/profile/packages and /etc/portage/profile/package.*. config_root - location of files to update protect - list of paths from CONFIG_PROTECT protect_mask - list of paths from CONFIG_PROTECT_MASK @@ -307,7 +307,13 @@ def update_config_files(config_root, protect, protect_mask, update_iter, match_c "package.mask", "package.properties", "package.unmask", "package.use" ] - myxfiles += [os.path.join("profile", x) for x in myxfiles] + myxfiles += [os.path.join("profile", x) for x in ( + "packages", "package.accept_keywords", + "package.keywords", "package.mask", + "package.unmask", "package.use", + "package.use.force", "package.use.mask", + "package.use.stable.force", "package.use.stable.mask" + )] abs_user_config = os.path.join(config_root, USER_CONFIG_PATH) recursivefiles = [] for x in myxfiles: @@ -356,7 +362,6 @@ def update_config_files(config_root, protect, protect_mask, update_iter, match_c if f is not None: f.close() - # update /etc/portage/packages.* ignore_line_re = re.compile(r'^#|^\s*$') if repo_dict is None: update_items = [(None, update_iter)] @@ -376,6 +381,9 @@ def update_config_files(config_root, protect, protect_mask, update_iter, match_c if atom[:1] == "-": # package.mask supports incrementals atom = atom[1:] + if atom[:1] == "*": + # packages file supports "*"-prefixed atoms as indication of system packages. + atom = atom[1:] if not isvalidatom(atom): continue new_atom = update_dbentry(update_cmd, atom)