Move detection of orphans from create_state()

- Create a sub to compute orphans and called at better times, to avoid
  including packages that were automatically removed from dependencies.
- Remove all automatically rejected packages from state, including the package
  asked to be removed.

backend/mdvpkg.pm

@@ -28,6 +28,34 @@ use urpm::orphans qw();
 use URPM;
 
 
+##
+# compute_orphans
+#     Compute from a $state object the orphans to remove and add them
+#     to @to_remove.
+# :Parameters:
+#     `$urpm` : The urpm object
+#     `$state` : The state object
+#     `$to_remove : list ref
+#         The list of names to append orphans.
+# :Returns:
+#     The $to_remove list ref
+#
+sub compute_orphans {
+    my $urpm = shift;
+    my $state = shift;
+    my $to_remove = shift;
+
+    urpm::orphans::compute_future_unrequested_orphans(
+	$urpm,
+	$state
+    );
+    push(@{ $to_remove },
+	 map {
+	     scalar $_->fullname
+	 } @{ $state->{orphans_to_remove} });
+    return $to_remove
+}
+
 ##
 # create_state
 #     Get lists of package fullnames for installation and removal to
@@ -68,14 +96,6 @@ sub create_state {
 			die {error => 'error-nothing-to-remove',
 			     names => []}
 		    };
-	urpm::orphans::compute_future_unrequested_orphans(
-	    $urpm,
-	    \%state
-	);
-	push(@to_remove,
-	     map {
-		 scalar $_->fullname
-	     } @{ $state{orphans_to_remove} });
     }
 
     my $restart;

backend/resolve.pl

@@ -153,6 +153,7 @@
 		my ($removed)
 		    = keys %{ $state->{rejected}{$_}{removed} };
 		push @{ $depends{$removed} ||= [] }, $_;
+		delete $state->{rejected}{$_};
 	    }
 	    foreach (keys %depends) {
 		delete $state->{rejected}{$_};
@@ -166,6 +167,8 @@
 	}
     }
 
+    mdvpkg::compute_orphans($urpm, $state, $to_remove);
+
     # Emit actions ...
     while (my ($id, $info) = each %{ $state->{selected} }) {
 	my $pkg = $urpm->{depslist}[$id];

backend/urpmi_backend.pl

@@ -156,8 +156,10 @@ sub on_task__commit {
     }
     or do {
 	response('error', $@->{error}, @{ $@->{names} });
+	return;
     };
 
+    $to_remove = mdvpkg::compute_orphans($urpm, $state, $to_remove);
 
     # Populate pkg_map ...
     my %pkg_map = ();