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 1RI2qn-00030P-Er for garchives@archives.gentoo.org; Sun, 23 Oct 2011 18:32:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3316721C023; Sun, 23 Oct 2011 18:32:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F38B821C023 for ; Sun, 23 Oct 2011 18:32:41 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 75C581B4009 for ; Sun, 23 Oct 2011 18:32:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 92C8780042 for ; Sun, 23 Oct 2011 18:32:40 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: 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: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: a3005f69ba99d0e882da44716e3743737e6e4987 Date: Sun, 23 Oct 2011 18:32:40 +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: X-Archives-Hash: 6e3b4dc03028e5048d372d636336d924 commit: a3005f69ba99d0e882da44716e3743737e6e4987 Author: Zac Medico gentoo org> AuthorDate: Sun Oct 23 18:31:05 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Oct 23 18:31:05 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Da3005f69 parse_updates: filter invalid for bug #388187 --- pym/portage/update.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/pym/portage/update.py b/pym/portage/update.py index 1a2c86c..6d13dfc 100644 --- a/pym/portage/update.py +++ b/pym/portage/update.py @@ -156,6 +156,7 @@ def parse_updates(mycontent): if len(mysplit) !=3D 3: errors.append(_("ERROR: Update command invalid '%s'") % myline) continue + valid =3D True for i in (1, 2): try: atom =3D Atom(mysplit[i]) @@ -169,7 +170,11 @@ def parse_updates(mycontent): else: errors.append( _("ERROR: Malformed update entry '%s'") % myline) + valid =3D False break + if not valid: + continue + if mysplit[0] =3D=3D "slotmove": if len(mysplit)!=3D4: errors.append(_("ERROR: Update command invalid '%s'") % myline)