From 8289ad7a405988f8dcdddfe5784e1a64fc377ab8 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@helsinki.at>
Date: Mon, 12 Apr 2010 14:29:31 +0000
Subject: fixed gui error callback

git-svn-id: https://svn.helsinki.at/rhimport/trunk@39 7c65635b-ec39-4f67-a626-873dbafdd612

diff --git a/rhimport b/rhimport
index e25a1d3..ce4463c 100755
--- a/rhimport
+++ b/rhimport
@@ -199,7 +199,7 @@ my $gui_error_cb = sub {
     print STDERR "no GUI definition found!\n";
     exit 2;
   }
-  $text . "\n\nVorgang abbrechen?";
+  $text .= "\n\nVorgang abbrechen?";
   my $parent_window = $guixml->get_widget('appwin');
   my $dialog = Gtk2::MessageDialog->new ($parent_window, 'destroy-with-parent',
                                          'error', 'yes-no', $text);
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;
   }
-- 
cgit v0.10.2