From 7d2ca5743f0bb550e198d3a097937e2e4c3f4883 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 19 Sep 2008 03:28:20 +0000 Subject: Implement the new EAPI 2 blocker behavior, including !!atom sytax which forbids temporary simultaneous installation of conflicting packages. svn path=/main/trunk/; revision=11517 --- bin/repoman | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/repoman b/bin/repoman index 932cf4c99..7e997d3d1 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1256,8 +1256,6 @@ for x in scanlist: badsyntax.append("'%s' not a valid atom" % token) else: is_blocker = atom.blocker - if atom.blocker: - atom = portage.dep.Atom(atom[1:]) if mytype == "DEPEND" and \ not is_blocker and \ @@ -1284,6 +1282,13 @@ for x in scanlist: (relative_path + ": %s use dependency" + \ " not supported with EAPI='%s':" + \ " '%s'") % (mytype, eapi, atom)) + if atom.blocker and atom.blocker.overlap.forbid \ + and eapi in ("0", "1"): + stats['EAPI.incompatible'] += 1 + fails['EAPI.incompatible'].append( + (relative_path + ": %s new blocker syntax" + \ + " not supported with EAPI='%s':" + \ + " '%s'") % (mytype, eapi, atom)) type_list.extend([mytype] * (len(badsyntax) - len(type_list))) -- cgit v1.2.3-1-g7c22