From 9f9e8c4f608824d6ba0b9b9233781e4011ebae5d Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sat, 29 Sep 2007 20:19:29 +0000 Subject: [PATCH] Remove CHOST mismatch logic since zmedico now implemented CHOST matching during the dependency calculation phase. svn path=/main/branches/prefix/; revision=7881 --- pym/portage/__init__.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 22249ab61..de86361c6 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -5162,7 +5162,6 @@ def pkgmerge(mytbz2, myroot, mysettings, mydbapi=None, vartree=None, prev_mtimes portage.util.ensure_dirs(catdir, uid=portage_uid, gid=portage_gid, mode=070, mask=0) builddir_lock = portage.locks.lockdir(builddir) - chost = mysettings["CHOST"] try: portage.locks.unlockdir(catdir_lock) finally: @@ -5189,13 +5188,6 @@ def pkgmerge(mytbz2, myroot, mysettings, mydbapi=None, vartree=None, prev_mtimes # We want to install in "our" prefix, not the binary one mysettings["EPREFIX"] = EPREFIX - # Let's assure that what we dump into our system has also a - # chance of being able to run... - if mysettings.get("CHOST", "") != chost: - writemsg("!!! Incompatible binary package: made for %s, you are on %s\n" % (mysettings.get("CHOST", ""), chost), - noiselevel=-1) - return 1 - # Eventually we'd like to pass in the saved ebuild env here. retval = doebuild(myebuild, "setup", myroot, mysettings, debug=debug, tree="bintree", mydbapi=mydbapi, vartree=vartree) -- 2.26.2