public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:prefix commit in: pym/_emerge/
Date: Sat,  5 Feb 2011 12:23:42 +0000 (UTC)	[thread overview]
Message-ID: <50d3d61aaaf8745d1c155e7825dc182335f8c476.grobian@gentoo> (raw)

commit:     50d3d61aaaf8745d1c155e7825dc182335f8c476
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  5 12:21:10 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 12:21:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=50d3d61a

binpkg: check for missing EPREFIX by absence only

Do not treat an empty prefix (the empty string) as an absent EPREFIX.
If people use EPREFIX='', then they should be able to use binpkgs as
well.

---
 pym/_emerge/Package.py  |    2 +-
 pym/_emerge/depgraph.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py
index 98a32a6..c809337 100644
--- a/pym/_emerge/Package.py
+++ b/pym/_emerge/Package.py
@@ -184,7 +184,7 @@ class Package(Task):
 
 		if self.built and not self.installed:
 			# we can have an old binary which has no EPREFIX information
-			if "EPREFIX" not in self.metadata or not self.metadata["EPREFIX"]:
+			if "EPREFIX" not in self.metadata:
 				masks['EPREFIX.missing'] = ''
 			if len(self.metadata["EPREFIX"].strip()) < len(EPREFIX):
 				masks['EPREFIX.tooshort'] = self.metadata["EPREFIX"].strip()

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 17ed2d8..08a8c74 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -5965,7 +5965,7 @@ def _get_masking_status(pkg, pkgsettings, root_config, myrepo=None, use=None):
 				pkg.metadata["CHOST"]))
 
 	if pkg.built and not pkg.installed:
-		if not "EPREFIX" in pkg.metadata or not pkg.metadata["EPREFIX"]:
+		if not "EPREFIX" in pkg.metadata:
 			mreasons.append(_MaskReason("EPREFIX", "missing EPREFIX"))
 		elif len(pkg.metadata["EPREFIX"].strip()) < len(pkgsettings["EPREFIX"]):
 			mreasons.append(_MaskReason("EPREFIX", "EPREFIX: '%s' too small" % pkg.metadata["EPREFIX"]))



             reply	other threads:[~2011-02-05 12:23 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-05 12:23 Fabian Groffen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-02-05 12:25 [gentoo-commits] proj/portage:prefix commit in: pym/_emerge/ Fabian Groffen
2011-02-05 12:25 Fabian Groffen
2011-02-05 12:25 Fabian Groffen
2011-02-05 12:25 Fabian Groffen
2011-03-13 15:02 Fabian Groffen
2011-07-26 17:58 Fabian Groffen
2011-08-25 20:26 Fabian Groffen
2011-08-29 19:03 Fabian Groffen
2011-08-31 18:47 Fabian Groffen
2012-02-09  8:05 Fabian Groffen
2012-09-06 18:14 Fabian Groffen
2012-09-30 11:33 Fabian Groffen
2013-02-28 20:12 Fabian Groffen
2013-03-23 22:00 Fabian Groffen
2015-06-02 17:42 Fabian Groffen
2017-03-24  7:43 Fabian Groffen
2017-03-24 19:09 Fabian Groffen
2017-03-24 19:09 Fabian Groffen
2018-05-25 19:32 Fabian Groffen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=50d3d61aaaf8745d1c155e7825dc182335f8c476.grobian@gentoo \
    --to=grobian@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox