[Bps-public-commit] r17533 - Prophet/trunk/lib/Prophet

[jesse at bestpractical.com]

Author: jesse
Date: Fri Jan  2 16:25:14 2009
New Revision: 17533

Modified:
   Prophet/trunk/lib/Prophet/Conflict.pm

Log:
* Don't try to prompt the user for an interactive resolver when running non-interactively


Modified: Prophet/trunk/lib/Prophet/Conflict.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/Conflict.pm	(original)
+++ Prophet/trunk/lib/Prophet/Conflict.pm	Fri Jan  2 16:25:14 2009
@@ -81,7 +81,7 @@
         sub { Prophet::Resolver::IdenticalChanges->new->run(@_); },
         $resdb ? sub { Prophet::Resolver::FromResolutionDB->new->run(@_) } : (),
         $self->resolvers,
-        sub { Prophet::Resolver::Prompt->new->run(@_); },
+        (-t STDIN && -t STDOUT) ? sub { Prophet::Resolver::Prompt->new->run(@_); } : (),
         sub { Prophet::Resolver::Failed->new->run(@_) },
     );
     my $resolutions = Prophet::ChangeSet->new({