[jhbuild] Log when we're moving files from temporary DESTDIR
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] Log when we're moving files from temporary DESTDIR
- Date: Mon, 11 Jul 2011 17:51:57 +0000 (UTC)
commit ac008d620310d1ab7693cb4c3060485bcb507ce7
Author: Colin Walters <walters verbum org>
Date: Tue Jul 5 20:26:28 2011 -0400
Log when we're moving files from temporary DESTDIR
The process was kind of invisible in general, but if something
goes wrong we really want to see what's going on. This comes
at the end of typical hundreds of lines of "make install" spam,
so 3 lines of information seems fine.
https://bugzilla.gnome.org/show_bug.cgi?id=654062
jhbuild/modtypes/__init__.py | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/jhbuild/modtypes/__init__.py b/jhbuild/modtypes/__init__.py
index 739d043..d2f060d 100644
--- a/jhbuild/modtypes/__init__.py
+++ b/jhbuild/modtypes/__init__.py
@@ -29,6 +29,7 @@ __all__ = [
import os
import shutil
+import logging
from jhbuild.errors import FatalError, CommandError, BuildStateError, \
SkipToEnd, UndefinedRepositoryError
@@ -181,6 +182,7 @@ them into the prefix."""
if prefix.endswith('/'):
prefix = prefix[:-1]
+ num_copied = 0
names = os.listdir(curdir)
for filename in names:
src_path = os.path.join(curdir, filename)
@@ -193,17 +195,21 @@ them into the prefix."""
os.mkdir(dest_path)
else:
os.mkdir(dest_path)
- self._process_install_files(installroot, src_path, prefix)
+ num_copied += self._process_install_files(installroot, src_path, prefix)
os.rmdir(src_path)
else:
+ num_copied += 1
os.rename(src_path, dest_path)
+ return num_copied
def process_install(self, buildscript, revision):
assert self.supports_install_destdir
destdir = self._get_destdir(buildscript)
self._clean_la_files(destdir)
buildscript.packagedb.add(self.name, revision or '', destdir)
- self._process_install_files(destdir, destdir, buildscript.config.prefix)
+ logging.info(_('Moving temporary DESTDIR %r into build prefix') % (destdir, ))
+ num_copied = self._process_install_files(destdir, destdir, buildscript.config.prefix)
+ logging.info(_('Install complete: %d files copied') % (num_copied, ))
try:
os.rmdir(destdir)
except:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]