[Libreoffice-commits] .: 2 commits - solenv/bin

[Caolán McNamara]

 solenv/bin/build.pl                            |    2 +-
 solenv/bin/modules/installer/simplepackage.pm  |    2 +-
 solenv/bin/modules/installer/systemactions.pm  |    2 +-
 solenv/bin/modules/par2script/systemactions.pm |    2 +-
 solenv/bin/modules/pre2par/systemactions.pm    |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit d1f80131c85918d58774a8b344b4ce5bee9383ee
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 7 12:13:33 2010 +0000

    closing the stream is sufficient to close zenity

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 33e7916..43c0188 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -2107,7 +2107,7 @@ sub zenity_open {
 sub zenity_close {
     if (zenity_enabled()) {
         sleep(1); # Give Zenity a chance to show the message.
-        kill 1, $zenity_pid;
+        close($zenity_in);
     };
 };
 
commit f1fa83c1845a1d98e622d31a113e0faf766c97da
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 7 09:43:24 2010 +0000

    include error message to explain copy failure

diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 3157ab8..9fad400 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -696,7 +696,7 @@ sub create_simple_package
             }
             else
             {
-                $infoline = "ERROR: Could not copy $source to $destination\n";
+                $infoline = "ERROR: Could not copy $source to $destination $!\n";
                 $returnvalue = 0;
             }
 
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index a6a8380..596fb09 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -343,7 +343,7 @@ sub copy_one_file
     }
     else
     {
-        $infoline = "ERROR: Could not copy $source to $dest\n";
+        $infoline = "ERROR: Could not copy $source to $dest $!\n";
         $returnvalue = 0;
     }
 
diff --git a/solenv/bin/modules/par2script/systemactions.pm b/solenv/bin/modules/par2script/systemactions.pm
index 437a36a..5f5d62b 100644
--- a/solenv/bin/modules/par2script/systemactions.pm
+++ b/solenv/bin/modules/par2script/systemactions.pm
@@ -133,7 +133,7 @@ sub copy_one_file
     }
     else
     {
-        $infoline = "Error: Could not copy $source to $dest\n";
+        $infoline = "Error: Could not copy $source to $dest $!\n";
         $returnvalue = 0;
     }
     
diff --git a/solenv/bin/modules/pre2par/systemactions.pm b/solenv/bin/modules/pre2par/systemactions.pm
index 3f461f0..1634a2d 100644
--- a/solenv/bin/modules/pre2par/systemactions.pm
+++ b/solenv/bin/modules/pre2par/systemactions.pm
@@ -155,7 +155,7 @@ sub copy_one_file
     }
     else
     {
-        $infoline = "Error: Could not copy $source to $dest\n";
+        $infoline = "Error: Could not copy $source to $dest $!\n";
         $returnvalue = 0;
     }