From 68e08c0e8da12147e84938f59e72fbb93014120a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 20 Nov 2008 02:40:33 +0000 Subject: Bug #247370 - Use a private PORTAGE_TMPDIR for --fetchonly mode in order do avoid locking the normal build dir location (similar to bug #245231). The EbuildFetchPretend class is renamed to EbuildFetchonly and it's used for --fetchonly mode regardless of whether --pretend is enabled. Also, fix stdout/stderr flushing in JobStatusDisplay.displayMessage() and portage.spawn() to ensure output always occurs in the correct order when displaying pkg_nofetch() output in --fetchonly mode. (trunk r12006) svn path=/main/branches/2.1.6/; revision=12007 --- pym/_emerge/__init__.py | 18 ++++++++++++------ pym/portage/__init__.py | 5 +++-- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index cf4569f54..d2a798608 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -1564,9 +1564,9 @@ class _PackageMetadataWrapper(_PackageMetadataWrapperBase): v = 0 self._pkg.mtime = v -class EbuildFetchPretend(SlotObject): +class EbuildFetchonly(SlotObject): - __slots__ = ("fetch_all", "pkg", "settings") + __slots__ = ("fetch_all", "pkg", "pretend", "settings") def execute(self): # To spawn pkg_nofetch requires PORTAGE_BUILDDIR for @@ -1602,9 +1602,13 @@ class EbuildFetchPretend(SlotObject): retval = portage.doebuild(ebuild_path, "fetch", self.settings["ROOT"], self.settings, debug=debug, - listonly=1, fetchonly=1, fetchall=self.fetch_all, + listonly=self.pretend, fetchonly=1, fetchall=self.fetch_all, mydbapi=portdb, tree="porttree") + if retval != os.EX_OK: + msg = "Fetch failed for '%s'" % (pkg.cpv,) + eerror(msg, phase="unpack", key=pkg.cpv) + portage.elog.elog_process(self.pkg.cpv, self.settings) return retval @@ -2474,10 +2478,11 @@ class EbuildBuild(CompositeTask): pkg = self.pkg settings = self.settings - if opts.fetchonly and opts.pretend: - fetcher = EbuildFetchPretend( + if opts.fetchonly: + fetcher = EbuildFetchonly( fetch_all=opts.fetch_all_uri, - pkg=pkg, settings=settings) + pkg=pkg, pretend=opts.pretend, + settings=settings) retval = fetcher.execute() self.returncode = retval self.wait() @@ -8900,6 +8905,7 @@ class JobStatusDisplay(object): self._erase() self.out.write(self._format_msg(msg) + self._term_codes['newline']) + self.out.flush() self._displayed = False if was_displayed: diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 3415f5760..6c369efbb 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -3046,11 +3046,12 @@ def spawn(mystring, mysettings, debug=0, free=0, droppriv=0, sesandbox=0, fakero # In some cases the above print statements don't flush stdout, so # it needs to be flushed before allowing a child process to use it # so that output always shows in the correct order. + stdout_filenos = (sys.stdout.fileno(), sys.stderr.fileno()) for fd in fd_pipes.itervalues(): - if fd == sys.stdout.fileno(): + if fd in stdout_filenos: sys.stdout.flush() - if fd == sys.stderr.fileno(): sys.stderr.flush() + break # The default policy for the sesandbox domain only allows entry (via exec) # from shells and from binaries that belong to portage (the number of entry -- cgit v1.2.3-1-g7c22