From 58d326af715f7a0dec6f2dde1417a8cd637dc96c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 13 Jul 2007 23:42:34 +0000 Subject: Save the repo name along with the other metadata inside dyn_compile() so that it's saved inside binary packages for when they are finally merged. (trunk r7247) svn path=/main/branches/2.1.2/; revision=7248 --- pym/portage.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'pym/portage.py') diff --git a/pym/portage.py b/pym/portage.py index 9d829de3b..92938eb36 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -3171,6 +3171,16 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m mysettings["ROOT"] = myroot mysettings["STARTDIR"] = getcwd() + mysettings["PORTAGE_REPO_NAME"] = "" + # bindbapi has no getRepositories() method + if mydbapi and hasattr(mydbapi, "getRepositories"): + # do we have a origin repository name for the current package + repopath = os.sep.join(pkg_dir.split(os.path.sep)[:-2]) + for reponame in mydbapi.getRepositories(): + if mydbapi.getRepositoryPath(reponame) == repopath: + mysettings["PORTAGE_REPO_NAME"] = reponame + break + mysettings["EBUILD"] = ebuild_path mysettings["O"] = pkg_dir mysettings.configdict["pkg"]["CATEGORY"] = cat @@ -7759,19 +7769,6 @@ class dblink: for x in listdir(inforoot): self.copyfile(inforoot+"/"+x) - # do we have a origin repository name for the current package - repopath = os.sep.join(self.settings["O"].split(os.sep)[:-2]) - # bindbapi has no getRepositories() method - if mydbapi and hasattr(mydbapi, "getRepositories"): - foundname = False - for reponame in mydbapi.getRepositories(): - if mydbapi.getRepositoryPath(reponame) == repopath: - fd = open(os.path.join(self.dbtmpdir, "repository"), "w") - fd.write(reponame+"\n") - fd.close() - foundname = True - break - # get current counter value (counter_tick also takes care of incrementing it) # XXX Need to make this destroot, but it needs to be initialized first. XXX # XXX bis: leads to some invalidentry() call through cp_all(). -- cgit v1.2.3-1-g7c22