The branch, master has been updated
       via  d1c8040 Output "UNKNOWN" if starttime or endtime is -1. Fixes bug 
11382.
      from  9a12959 Support only splitting users/groups on commas. Fixes bug 
11817.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d1c80404fece1cd90631ebb687e050deb18acb31
Author: Wayne Davison <way...@samba.org>
Date:   Sun Apr 17 16:07:25 2016 -0700

    Output "UNKNOWN" if starttime or endtime is -1.
    Fixes bug 11382.

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

Summary of changes:
 main.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/main.c b/main.c
index e2b93c6..3132aa9 100644
--- a/main.c
+++ b/main.c
@@ -302,6 +302,13 @@ static void output_itemized_counts(const char *prefix, int 
*counts)
        rprintf(FINFO, "%s: %s%s\n", prefix, comma_num(total), buf);
 }
 
+static const char *bytes_per_sec_human_dnum(void)
+{
+       if (starttime == (time_t)-1 || endtime == (time_t)-1)
+               return "UNKNOWN";
+       return human_dnum((total_written + total_read) / (0.5 + (endtime - 
starttime)), 2);
+}
+
 static void output_summary(void)
 {
        if (INFO_GTE(STATS, 2)) {
@@ -342,7 +349,7 @@ static void output_summary(void)
                rprintf(FINFO,
                        "sent %s bytes  received %s bytes  %s bytes/sec\n",
                        human_num(total_written), human_num(total_read),
-                       human_dnum((total_written + total_read)/(0.5 + (endtime 
- starttime)), 2));
+                       bytes_per_sec_human_dnum());
                rprintf(FINFO, "total size is %s  speedup is %s%s\n",
                        human_num(stats.total_size),
                        comma_dnum((double)stats.total_size / 
(total_written+total_read), 2),


-- 
The rsync repository.

_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs

Reply via email to