From 771d4e512c5c8f94acb97c2720bbb32d3151e2f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Thu, 29 Sep 2005 11:30:40 +0000 Subject: [PATCH] - just give a warning if strip command fails (others do like that or simply ignoring the error too) - move strip action into build_packages for build-* commands to behave better... --- pisi/build.py | 6 ++++-- pisi/util.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pisi/build.py b/pisi/build.py index 33d8e7e8..35c8a137 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -162,8 +162,6 @@ class PisiBuild: self.run_build_action() self.run_install_action() - self.strip_install_dir() - # after all, we are ready to build/prepare the packages self.build_packages() @@ -431,6 +429,10 @@ class PisiBuild: def build_packages(self): """Build each package defined in PSPEC file. After this process there will be .pisi files hanging around, AS INTENDED ;)""" + + # Strip install directory before building .pisi packages. + self.strip_install_dir() + for package in self.spec.packages: # store additional files diff --git a/pisi/util.py b/pisi/util.py index ac9abca0..a61afdb0 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -381,7 +381,7 @@ def strip_file(filepath): p = os.popen("strip %s %s" %(flags, f)) ret = p.close() if ret: - raise UtilError, "strip command failed!" + ctx.ui.warning("strip command failed for file '%s'!" % f) if "current ar archive" in o: run_strip(filepath, "-g")