[debian-edu-commits] debian-edu/upstream/slbackup-php.git (#161) - master (branch) updated: 0.4.4-2-g0f5ef7b

[Mike Gabriel]

The branch, master has been updated
       via  0f5ef7b381373bcc2ad400ffea7545462caaa1e0 (commit)
      from  af17506690e5f26924d0ce90231b14e45b9dfc9e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0f5ef7b381373bcc2ad400ffea7545462caaa1e0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 10 09:35:12 2013 +0200

    Fix parsing of log file for the case that the server_destdir does not exist.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    8 ++++++++
 src/index.php    |    6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0b2414c..2cb5f24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+slbackup-php (0.4.5-0) UNRELEASED; urgency=low
+
+  * Upstream version (0.4.5):
+    - Fix parsing of log file for the case that the server_destdir does not
+      exist.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 10 Jun 2013 09:33:30 +0200
+
 slbackup-php (0.4.4-0) unstable; urgency=low
 
   * Upstream version (0.4.4):
diff --git a/src/index.php b/src/index.php
index 8a2e248..af36d65 100644
--- a/src/index.php
+++ b/src/index.php
@@ -561,15 +561,15 @@ global $backuphost, $backupuser, $logfile, $ssh_options, $ssh_askpass ;
 	        $log["start"] = strtotime($timestamp) ; 
 	    elseif ($info == "Finished slbackup.")
 	        $log["end"] = strtotime($timestamp) ; 
-	    elseif (strpos ($line, "Starting backup of client") !== false) {
+	    elseif (strpos ($line, "Starting backup of client ") !== false) {
 	        sscanf ($info, "Starting backup of client %s", $client) ; 
 	        if (!empty ($client))
 	            $log["clients"][$client]["start"] = strtotime($timestamp) ; 
-	    } elseif (strpos ($line, "Failed backing up client") !== false) {
+	    } elseif (strpos ($line, "Failed backing up client ") !== false) {
 	        sscanf ($info, "Failed backing up client %s", $client) ; 
 	        if (!empty ($client))
 	            $log["clients"][$client]["failed"] = strtotime($timestamp) ; 
-	    } elseif (strpos ($line, "Successfully finished backing up client") !== false) {
+	    } elseif (strpos ($line, "Successfully finished backing up client ") !== false) {
 	        sscanf ($info, "Successfully finished backing up client %s", $client) ; 
 	        if (!empty ($client))
 	            $log["clients"][$client]["ok"] = strtotime($timestamp) ; 


hooks/post-receive
-- 
slbackup-php.git (slbackup-php upstream project)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "slbackup-php.git" (slbackup-php upstream project).