[carton] 77/472: uninstaller can finalize earlier

[Lucas Kanashiro]

This is an automated email from the git hooks/post-receive script.

kanashiro-guest pushed a commit to branch master
in repository carton.

commit 96b1289da05e991a1153a977fae9ef446d42cfda
Author: Tatsuhiko Miyagawa <miyagawa at bulknews.net>
Date:   Tue Jun 28 14:58:08 2011 -0400

    uninstaller can finalize earlier
---
 lib/Carton.pm     | 5 ++---
 lib/Carton/CLI.pm | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/Carton.pm b/lib/Carton.pm
index 7676776..28e32a5 100644
--- a/lib/Carton.pm
+++ b/lib/Carton.pm
@@ -198,7 +198,7 @@ sub walk_down_tree {
 }
 
 sub build_tree {
-    my($self, $modules, %args) = @_;
+    my($self, $modules) = @_;
 
     my $idx  = $self->build_index($modules);
     my $pool = { %$modules }; # copy
@@ -209,8 +209,7 @@ sub build_tree {
         $self->_build_tree($pick, $tree, $tree, $pool, $idx);
     }
 
-    $tree->finalize
-        unless $args{no_finalize};
+    $tree->finalize;
 
     return $tree;
 }
diff --git a/lib/Carton/CLI.pm b/lib/Carton/CLI.pm
index c697416..bf8b9f1 100644
--- a/lib/Carton/CLI.pm
+++ b/lib/Carton/CLI.pm
@@ -196,13 +196,14 @@ sub cmd_uninstall {
     }
 
     # only can uninstall root dependencies
-    my $tree = $self->carton->build_tree($lock->{modules}, no_finalize => 1);
+    my $tree = $self->carton->build_tree($lock->{modules});
     for my $root ($tree->children) {
         if (grep $_->{name} eq $root->key, @meta) {
             $tree->remove_child($root);
         }
     }
-    $tree->finalize;
+
+    my @remains= grep $tree->has_child($_), keys %{$lock->{modules}};
 
     my @missing = grep !$tree->has_child($_), keys %{$lock->{modules}};
     for my $module (@missing) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/carton.git