Hi,
I did an NMU for this, patch is attached.
Kurt
diff -u tar-1.15.91/debian/changelog tar-1.15.91/debian/changelog
--- tar-1.15.91/debian/changelog
+++ tar-1.15.91/debian/changelog
@@ -1,3 +1,11 @@
+tar (1.15.91-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Make incremental restore work again. (Closes: #377330, #379393)
+ Patch provided by Vladimir Suplin <[EMAIL PROTECTED]>
+
+ -- Kurt Roeckx <[EMAIL PROTECTED]> Sat, 14 Oct 2006 13:06:37 +0000
+
tar (1.15.91-2) unstable; urgency=low
* add a NEWS.Debian file that communicates the change in wildcard processing
only in patch2:
unchanged:
--- tar-1.15.91.orig/src/incremen.c
+++ tar-1.15.91/src/incremen.c
@@ -1299,22 +1299,23 @@
free (p);
p = new_name (directory_name, cur);
- if (!(entry = dumpdir_locate (current_stat_info.dumpdir, cur))
- || (*entry == 'D' && S_ISDIR (st.st_mode))
- || (*entry == 'Y' && !S_ISDIR (st.st_mode)))
- {
- if (deref_stat (false, p, &st))
+ if (deref_stat (false, p, &st))
+ {
+ if (errno != ENOENT) /* FIXME: Maybe keep a list of renamed
+ dirs and check it here? */
{
- if (errno != ENOENT) /* FIXME: Maybe keep a list of renamed
- dirs and check it here? */
- {
- stat_diag (p);
- WARN ((0, 0, _("%s: Not purging directory: unable to stat"),
- quotearg_colon (p)));
- }
- continue;
+ stat_diag (p);
+ WARN ((0, 0, _("%s: Not purging directory: unable to stat"),
+ quotearg_colon (p)));
}
- else if (one_file_system_option && st.st_dev != root_device)
+ continue;
+ }
+
+ if (!(entry = dumpdir_locate (current_stat_info.dumpdir, cur))
+ || (*entry == 'D' && !S_ISDIR (st.st_mode))
+ || (*entry == 'Y' && S_ISDIR (st.st_mode)))
+ {
+ if (one_file_system_option && st.st_dev != root_device)
{
WARN ((0, 0,
_("%s: directory is on a different device: not purging"),
