diff --git a/doc/Tutorial.html b/doc/Tutorial.html index fcbaac81..3bd2fb0e 100644 --- a/doc/Tutorial.html +++ b/doc/Tutorial.html @@ -95,7 +95,7 @@

The FULL backup

you need an Internet access to read it.

- This make the free space on the first usb key floppy a bit smaller, I let + This make the free space on the first usb key a bit smaller, I let you make the substraction because this is subject to change from system to system, but let's assume dar_static is less than 5 MiB, thus the initial slice should not exceed 95 MB: @@ -315,7 +315,7 @@

Check the backup content

verify that all expected files are present in the output:

- dar -l /mnt/usb key/linux_full + dar -l /mnt/usb/linux_full

Testing the backup

@@ -326,7 +326,7 @@

Testing the backup

backup process):

- dar -t /mnt/usb key/linux_full + dar -t /mnt/usb/linux_full

If using removable media of poor quality, it is @@ -552,7 +552,7 @@

Recovering after a disk crash

If you have a lot of file to restore, you can activate the swap on the partition of your new hard drive: - swapon /dev/hda2 + swapon /dev/sda2

  • diff --git a/src/build/ChangeLog b/src/build/ChangeLog index 3b5b1684..be1b7e46 100644 --- a/src/build/ChangeLog +++ b/src/build/ChangeLog @@ -48,7 +48,9 @@ from 2.7.15 to 2.7.16 more than the half of kept entries... - adding kdf support for repairing operation instead of using the values of the archive/backup under reparation. - +- fixing bug in thread_cancellation class that led a cancelled thread kept + being recorded as cancelled forever, leading libdar to abort immediately when + run in a new thread having the the same tid. from 2.7.14 to 2.7.15 - updating libdar about CURLINFO_CONTENT_LENGTH_DOWNLOAD symbol which is diff --git a/src/libdar/thread_cancellation.cpp b/src/libdar/thread_cancellation.cpp index f3d228ec..d3b2edde 100644 --- a/src/libdar/thread_cancellation.cpp +++ b/src/libdar/thread_cancellation.cpp @@ -81,7 +81,7 @@ namespace libdar status.cancellation = false; status.flag = 0; } - else // pending cancellation for that thread + else // pending cancellation information for that thread { status = *it; preborn.erase(it); @@ -118,11 +118,7 @@ namespace libdar if(*ptr == nullptr) bug = true; else - { - if((*ptr)->status.cancellation) // cancellation for that thread - preborn.push_back((*ptr)->status); info.erase(ptr); - } CRITICAL_END; if(bug)