From: | "Mike Frysinger (vapier)" <vapier@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in net-misc/rsync/files: rsync-3.0.0-dry-run-hang.patch |
Date: | Mon, 17 Mar 2008 03:47:06 |
Message-Id: | E1Jb6JT-0005TF-UE@stork.gentoo.org |
1 | vapier 08/03/17 03:47:03 |
2 | |
3 | Added: rsync-3.0.0-dry-run-hang.patch |
4 | Log: |
5 | Fix from upstream for hang with --dry-run #193243 by David Leverton. |
6 | (Portage version: 2.2_pre2) |
7 | |
8 | Revision Changes Path |
9 | 1.1 net-misc/rsync/files/rsync-3.0.0-dry-run-hang.patch |
10 | |
11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/rsync/files/rsync-3.0.0-dry-run-hang.patch?rev=1.1&view=markup |
12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/rsync/files/rsync-3.0.0-dry-run-hang.patch?rev=1.1&content-type=text/plain |
13 | |
14 | Index: rsync-3.0.0-dry-run-hang.patch |
15 | =================================================================== |
16 | commit 24ded29ff63d0adee798936ad20f21befcf8187b |
17 | Author: Wayne Davison <wayned@×××××.org> |
18 | Date: Sun Mar 16 06:56:26 2008 -0700 |
19 | |
20 | Fixed a hang when using --remove-source-files in dry-run mode. |
21 | |
22 | diff --git a/generator.c b/generator.c |
23 | index b1634bd..4ec0ac4 100644 |
24 | --- a/generator.c |
25 | +++ b/generator.c |
26 | @@ -1856,7 +1856,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, |
27 | rprintf(FINFO, "generating and sending sums for %d\n", ndx); |
28 | |
29 | notify_others: |
30 | - if (remove_source_files && !delay_updates && !phase) |
31 | + if (remove_source_files && !delay_updates && !phase && !dry_run) |
32 | increment_active_files(ndx, itemizing, code); |
33 | if (inc_recurse && !dry_run) |
34 | cur_flist->in_progress++; |
35 | |
36 | |
37 | |
38 | -- |
39 | gentoo-commits@l.g.o mailing list |