aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-03-07 17:34:33 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-03-07 17:34:33 +0000
commit1c4ae968b3675e600d1cefa8d7e2f5fbba37d686 (patch)
treec84122e36e730a400ee4de5d3f919ce87a59d7ea
parent661dc16397d97014aca5f1584af069880d29f1b2 (diff)
downloadpaludis-1c4ae968b3675e600d1cefa8d7e2f5fbba37d686.tar.gz
paludis-1c4ae968b3675e600d1cefa8d7e2f5fbba37d686.tar.xz
Fix cosmetic bug where a split would be shown but not carried out
-rw-r--r--paludis/stripper.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/paludis/stripper.cc b/paludis/stripper.cc
index 0a58bee..1e17428 100644
--- a/paludis/stripper.cc
+++ b/paludis/stripper.cc
@@ -100,12 +100,10 @@ Stripper::do_dir_recursive(const FSEntry & f)
{
FSEntry target(_imp->options[k::debug_dir()] / d->strip_leading(_imp->options[k::image_dir()]));
target = target.dirname() / (target.basename() + ".debug");
- on_split(*d, target);
do_split(*d, target);
}
else if (std::string::npos != t.find("current ar archive"))
{
- on_strip(*d);
do_strip(*d, "-g");
}
else
@@ -133,6 +131,7 @@ void
Stripper::do_strip(const FSEntry & f, const std::string & options)
{
Context context("When stripping '" + stringify(f) + "':");
+ on_strip(f);
if (0 != run_command(Command("strip " + options + " '" + stringify(f) + "'")))
Log::get_instance()->message(ll_warning, lc_context) << "Couldn't strip '" << f << "'";
}
@@ -156,6 +155,8 @@ Stripper::do_split(const FSEntry & f, const FSEntry & g)
break;
}
+ on_split(f, g);
+
{
std::list<FSEntry> to_make;
for (FSEntry d(g.dirname()) ; (! d.exists()) && (d != _imp->options[k::image_dir()]) ; d = d.dirname())