diff options
| -rw-r--r-- | pym/_emerge/__init__.py | 77 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 3 |
2 files changed, 48 insertions, 32 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index c74b5f12e..9c9c70af0 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -1876,7 +1876,7 @@ class SpawnProcess(SubProcess): class EbuildFetcher(SpawnProcess): - __slots__ = ("pkg",) + __slots__ = ("fetchonly", "pkg",) def start(self): @@ -1887,7 +1887,8 @@ class EbuildFetcher(SpawnProcess): fetch_env = settings.environ() fetch_env["PORTAGE_NICENESS"] = "0" - fetch_env["PORTAGE_PARALLEL_FETCHONLY"] = "1" + if self.fetchonly: + fetch_env["PORTAGE_PARALLEL_FETCHONLY"] = "1" ebuild_binary = os.path.join( settings["EBUILD_BIN_PATH"], "ebuild") @@ -1985,52 +1986,70 @@ class EbuildBuild(CompositeTask): def start(self): - args_set = self.args_set - find_blockers = self.find_blockers - ldpath_mtimes = self.ldpath_mtimes logger = self.logger opts = self.opts pkg = self.pkg - pkg_count = self.pkg_count - scheduler = self.scheduler settings = self.settings world_atom = self.world_atom root_config = pkg.root_config - root = root_config.root - system_set = root_config.sets["system"] - world_set = root_config.sets["world"] - vartree = root_config.trees["vartree"] tree = "porttree" self._tree = tree portdb = root_config.trees[tree].dbapi - debug = settings.get("PORTAGE_DEBUG") == "1" - features = self.settings.features settings["EMERGE_FROM"] = pkg.type_name settings.backup_changes("EMERGE_FROM") settings.reset() ebuild_path = portdb.findname(self.pkg.cpv) self._ebuild_path = ebuild_path - #buildsyspkg: Check if we need to _force_ binary package creation - issyspkg = "buildsyspkg" in features and \ - system_set.findAtomForPackage(pkg) and \ - not opts.buildpkg - - if opts.fetchonly: - if opts.pretend: + if opts.fetchonly and opts.pretend: fetcher = EbuildFetchPretend( fetch_all=opts.fetch_all_uri, pkg=pkg, settings=settings) retval = fetcher.execute() self.returncode = retval self.wait() + return - else: - fetcher = EbuildFetcher(pkg=pkg, scheduler=scheduler) - self._start_task(fetcher, self._fetchonly_exit) + fetch_log = None + if self.background: + fetch_log = self.scheduler.fetch.log_file + fetcher = EbuildFetcher(fetchonly=opts.fetchonly, + background=self.background, logfile=fetch_log, + pkg=pkg, scheduler=self.scheduler) + + if self.background: + fetcher.addExitListener(self._fetch_exit) + self._current_task = fetcher + self.scheduler.fetch.schedule(fetcher) + else: + self._start_task(fetcher, self._fetch_exit) + + def _fetch_exit(self, fetcher): + + opts = self.opts + pkg = self.pkg + + if opts.fetchonly: + if self._final_exit(fetcher) != os.EX_OK: + eerror("!!! Fetch for %s failed, continuing..." % pkg.cpv, + phase="unpack", key=pkg.cpv) + self.wait() return + if self._default_exit(fetcher) != os.EX_OK: + self.wait() + return + + logger = self.logger + opts = self.opts + pkg_count = self.pkg_count + scheduler = self.scheduler + settings = self.settings + features = settings.features + ebuild_path = self._ebuild_path + system_set = pkg.root_config.sets["system"] + self._build_dir = EbuildBuildDir(pkg=pkg, settings=settings) self._build_dir.lock() @@ -2042,6 +2061,11 @@ class EbuildBuild(CompositeTask): (pkg_count.curval, pkg_count.maxval, pkg.cpv) logger.log(msg, short_msg=short_msg) + #buildsyspkg: Check if we need to _force_ binary package creation + issyspkg = "buildsyspkg" in features and \ + system_set.findAtomForPackage(pkg) and \ + not opts.buildpkg + if opts.buildpkg or issyspkg: self._buildpkg = True @@ -2066,13 +2090,6 @@ class EbuildBuild(CompositeTask): scheduler=scheduler, settings=settings) self._start_task(build, self._build_exit) - def _fetchonly_exit(self, fetcher): - if self._final_exit(fetcher) != os.EX_OK: - pkg = self.pkg - eerror("!!! Fetch for %s failed, continuing..." % pkg.cpv, - phase="unpack", key=pkg.cpv) - self.wait() - def _unlock_builddir(self): portage.elog.elog_process(self.pkg.cpv, self.settings) self._build_dir.unlock() diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index ca3de8c2c..1feab98f4 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -5337,8 +5337,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, # unpack compile install`, we will try and fetch 4 times :/ need_distfiles = (mydo in ("fetch", "unpack") or \ mydo not in ("digest", "manifest") and "noauto" not in features) - emerge_skip_distfiles = "EMERGE_FROM" in mysettings and \ - mydo not in ("fetch", "unpack") + emerge_skip_distfiles = returnpid if not emerge_skip_distfiles and \ need_distfiles and not fetch( fetchme, mysettings, listonly=listonly, fetchonly=fetchonly): |