summaryrefslogtreecommitdiff
path: root/rhimport.pm
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2010-04-12 14:29:31 (GMT)
committerChristian Pointner <equinox@helsinki.at>2010-04-12 14:29:31 (GMT)
commit8289ad7a405988f8dcdddfe5784e1a64fc377ab8 (patch)
tree2dd5a1310f56f7e36c202ba06daebccf784c2a3f /rhimport.pm
parent10f8c9198930c806fc01d1ca3e4efcf9a6c607d8 (diff)
fixed gui error callback
git-svn-id: https://svn.helsinki.at/rhimport/trunk@39 7c65635b-ec39-4f67-a626-873dbafdd612
Diffstat (limited to 'rhimport.pm')
-rw-r--r--rhimport.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/rhimport.pm b/rhimport.pm
index 2d2f190..9081b4c 100644
--- a/rhimport.pm
+++ b/rhimport.pm
@@ -33,7 +33,7 @@ my $ssh_host = "airplay";
my $ssh_user = "rhimport";
my $ssh_key_file = "id_dsa";
my $ssh_dir = "/programm/.rhimport";
-my $rdimport_wrapper = "/usr/local/bin/dropbox_newfile.pl1";
+my $rdimport_wrapper = "/usr/local/bin/dropbox_newfile.pl";
sub get_dropboxes
{
@@ -205,7 +205,7 @@ sub scp_put_file {
sub ssh_exec_command {
my ($command) = @_;
- my @cmd = ( 'ssh', '-q' , '-i', $ssh_key_file, "$ssh_user\@$ssh_host" , $command );
+ my @cmd = ( 'ssh' , '-i', $ssh_key_file, "$ssh_user\@$ssh_host" , $command );
my ($reader, $writer, $error ) = ( new IO::Handle, new IO::Handle, new IO::Handle );
$writer->autoflush(1);
local $SIG{CHLD} = 'DEFAULT';
@@ -246,7 +246,7 @@ sub import_file
print "Import Error\n";
delete_file($remote_file);
if($error_cb) {
- return $error_cb->($err);
+ return $error_cb->("Import Fehler: $error");
}
return 0;
}