Commit 37ce1679 authored by Wayne Davison's avatar Wayne Davison

We can't decrement the in_progress value for a hard-linked file until

the generator gets a chance to finish the hard links.
parent 88a74268
......@@ -1873,6 +1873,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
file = flist->files[ndx - flist->ndx_start];
assert(file->flags & FLAG_HLINKED);
finish_hard_link(file, f_name(file, fbuf), ndx, NULL, itemizing, code, -1);
flist->in_progress--;
}
#endif
......
......@@ -181,7 +181,6 @@ static void got_flist_entry_status(enum festatus status, const char *buf)
struct file_list *flist = flist_for_ndx(ndx);
assert(flist != NULL);
assert(ndx >= flist->ndx_start);
if (remove_source_files) {
active_filecnt--;
......@@ -197,8 +196,10 @@ static void got_flist_entry_status(enum festatus status, const char *buf)
send_msg(MSG_SUCCESS, buf, 4, 0);
if (preserve_hard_links) {
struct file_struct *file = flist->files[ndx - flist->ndx_start];
if (F_IS_HLINKED(file))
if (F_IS_HLINKED(file)) {
flist_ndx_push(&hlink_list, ndx);
flist->in_progress++;
}
}
break;
case FES_REDO:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment