Rob Browning [Mon, 22 Nov 2021 20:03:26 +0000 (14:03 -0600)]
bloom.do_bloom: always close filter; fix None vs 0 tests
Running a "split -n" for a larger file caused the assertion in
ShaBloom.__del__ to fail, i.e. the filter hadn't been explicitly
closed. Fix the logic in do_bloom to be careful about 0 vs None since
ShaBloom has a __len__ method, and add one missing explicit close().
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sun, 24 Oct 2021 17:24:16 +0000 (12:24 -0500)]
Check that all context managed objects are properly closed
Ensure all of our context managed objects have a __del__ that asserts
that the instance has been properly closed so that we'll be more
likely to notice related oversights.
This will only work in cases where __del__ is called before shutdown,
but that should normally be the case for cpython.
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Tue, 28 Sep 2021 05:32:37 +0000 (00:32 -0500)]
CatPipe.__del__: replace with context management
Drop AbortableIter since CatFile is the only user, in favor of just
closing the catpipe (what the AbortableIter was doing) in the get()
exception handler.
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sun, 17 Oct 2021 17:17:36 +0000 (12:17 -0500)]
ShaBloom.__del__: replace with context management
These changes also just use finally in some cases, instead of the more
complex py2 compatible BaseException/with_pending_raise() catch becase
I'm leaning in favor of just dropping python 2 support soon.
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sun, 3 Oct 2021 18:25:08 +0000 (13:25 -0500)]
compat.mmap: add py2 context management and use everywhere
It looks like py2 doesn't support mmap __enter__ and __exit__, so add
them, and switch all our mmap instances to be compat.mmap so that
we'll be able to context manage them.
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Bas Stottelaar [Fri, 7 Aug 2020 11:04:19 +0000 (13:04 +0200)]
git/packwriter: open(..) prohibited in __del__
When an exception occurs, __del__ is invoked by the interpreter, to
perform cleanup. It seems that since Python 3.4, the behaviour has
changed, and also prohibits invocations of open(..) (source:
https://stackoverflow.com/a/29737870). Instead, contextmanager API
should be used (source: https://stackoverflow.com/a/26544629), which
seems to be in place already.
This should fix exception messages such as 'NameError: name 'open'
is not defined'.
Signed-off-by: Bas Stottelaar <basstottelaar@gmail.com> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sat, 23 Oct 2021 17:59:06 +0000 (12:59 -0500)]
git.packwriter: explicitly manage lifetimes
Explicitly close all packwriters, instead of relying on __del__. Use
"with ..." context management in most cases.. This is in preparation
for removing __del__.
Rework _end to handle *all* cleanup and to ensure that we always
release the relevant resources, whether closing normally, or aborting.
This means that we only have two places to consider with respect to
resource management: __init__ and _end.
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sun, 26 Sep 2021 00:17:13 +0000 (19:17 -0500)]
save: separate opt handling and work; isolate resource lifetimes
Rearrange save to disentangle the options parsing, saving, and
resource (e.g. packfile) lifetime management before we replace __del__
with context management.
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sat, 25 Sep 2021 21:46:16 +0000 (16:46 -0500)]
split: separate opt handling and work; isolate packfile lifetime
Rearrange split to disentangle the options parsing, splitting, and
resource (packfile) lifetime management before we replace __del__ with
context management.
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sat, 25 Sep 2021 19:02:43 +0000 (14:02 -0500)]
split: handle --noop/copy via do nothing packwriter
This allows us to remove the special-casing for those code paths, and
rearrange the structure in preparation for handling the packwriter via
a context manager, in preparation for removing __del__.
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sat, 30 Oct 2021 19:07:55 +0000 (14:07 -0500)]
configure: support optional cc arguments
I noticed in some unrelated reports that older compilers were
rejecting -Wno-unsed-command-line-argument, so add
bup-add-cflag-if-supported to configure and use it for that argument.
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sat, 30 Oct 2021 18:23:45 +0000 (13:23 -0500)]
bitmatch: avoid signed/unsigned comparison
Thanks to Brian Minton for reporting the problem:
I'm using gcc version 8.3.0 (Debian 8.3.0-6). The system is x86_64
with 8 GB ram. When I try to build the source, with make, I get the
following error:
...
In file included from lib/bup/_helpers.c:69:
lib/bup/_helpers.c: In function 'bitmatch':
.../src/bup/src/bup/intprops.h:626:22: error: comparison of
integer expressions of different signedness: 'long long unsigned int' and
'Py_ssize_t' {aka 'long int'} [-Werror=sign-compare]
: (tmax) / (b) < (a)))
^
.../src/bup/src/bup/intprops.h:427:10: note: in expansion of
macro '_GL_INT_MULTIPLY_RANGE_OVERFLOW'
&& _GL_INT_MULTIPLY_RANGE_OVERFLOW (a, b, 0, (__typeof__ (*(r))) -1)) \
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.../src/bup/src/bup/intprops.h:655:36: note: in expansion of
macro 'INT_MULTIPLY_WRAPV'
#define INT_MULTIPLY_OK(a, b, r) ! INT_MULTIPLY_WRAPV (a, b, r)
^~~~~~~~~~~~~~~~~~
lib/bup/_helpers.c:624:10: note: in expansion of macro 'INT_MULTIPLY_OK'
if (!INT_MULTIPLY_OK(byte, 8, &result)
^~~~~~~~~~~~~~~
And to Mark J Hewitt for reporting the issue on a 32-bit Raspberry Pi
system.
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Sun, 17 May 2020 19:55:28 +0000 (21:55 +0200)]
web: do not show size for dirs and symlinks
It's strange to see a lot of zeros for these items, just
don't show them by making the display_size None.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Fri, 17 Sep 2021 17:56:38 +0000 (12:56 -0500)]
test-index-check-device: unmount "lazily" to avoid potential crash
Apparently the umount was failing on some systems, and since we're
already using loop, mke2fs, etc. which aren't really portable, and we
use "umount -l" in cleanup-mounts-under, just use it here too for now.
Thanks to Abdel Said for reporting the problem:
! t/test-index-check-device.sh:38 mke2fs -F -j -m 0 testfs.img ok
! t/test-index-check-device.sh:39 mount -o loop testfs.img /opt/bup/t/mnt/test-index-check-device.sh-YuNQZtU ok
! t/test-index-check-device.sh:41 chown root:root /opt/bup/t/mnt/test-index-check-device.sh-YuNQZtU ok
! t/test-index-check-device.sh:42 chmod 0700 /opt/bup/t/mnt/test-index-check-device.sh-YuNQZtU ok
! t/test-index-check-device.sh:45 date ok
umount: /opt/bup/t/mnt/test-index-check-device.sh-YuNQZtU: device is busy.
(In some cases useful info about processes that use
the device is found by lsof(8) or fuser(1))
! t/test-index-check-device.sh:46 umount /opt/bup/t/mnt/test-index-check-device.sh-YuNQZtU FAILED
Johannes Berg [Fri, 27 Aug 2021 23:07:16 +0000 (01:07 +0200)]
pylint: enable inconsistent-return-statements
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org>
[rlb@defaultvalue.org: return early for dry run in import_duplicity exo] Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Fri, 27 Aug 2021 22:54:50 +0000 (00:54 +0200)]
pylint: enable catching-non-exception
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Fri, 27 Aug 2021 22:40:16 +0000 (00:40 +0200)]
pylint: add undefined-variable
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org>
[rlb@defaultvalue.org: add missing %s in validate_vfs_path changes] Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Fri, 27 Aug 2021 22:33:13 +0000 (00:33 +0200)]
pylint: enable unidiomatic-typecheck
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org>
[rlb@defaultvalue.org: change isinstance str checks to compat.str_type] Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Fri, 27 Aug 2021 22:30:41 +0000 (00:30 +0200)]
pylint: enable consider-using-in
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Fri, 27 Aug 2021 22:27:53 +0000 (00:27 +0200)]
pylint: enable useless-return
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Fri, 27 Aug 2021 22:25:32 +0000 (00:25 +0200)]
pylint: enable return-in-init
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Fri, 27 Aug 2021 22:08:38 +0000 (00:08 +0200)]
pylint: check for trailing whitespace
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Sun, 12 Sep 2021 18:58:45 +0000 (20:58 +0200)]
metadata: accept EOPNOTSUPP for lchmod()
On some systems (e.g. mine, Fedora 33) python2 has
(started to have?) lchmod(), as glibc has it, but
that always only returns EOPNOTSUPP if you really
try to operate on a symlink. Allow for that and
handle it just like ENOSYS.
Note that the handling of ENOSYS is wrong, since
integers can't be thrown or caught - pylint found
this as well, but since I'm fixing EOPNOTSUPP here
I need to fix that at the same time.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sat, 11 Sep 2021 21:02:19 +0000 (16:02 -0500)]
configure: add --with-pylint=[yes|no|maybe] defaulting to maybe
When set to no, don't run pylint from ./pylint, just exit
successfully. When set to maybe, use dev/have-pylint to figure out if
pylint is available, and if so, run it, otherwise exit successfully
after describing the situation. When set to yes, always try to run
pylint.
This may be useful more generally, but in particular, it makes it
possible to run this:
./configure --with-pylint=maybe
make check-both
in situations where pylint is available for say python 3, but not
python 2.
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Fri, 27 Aug 2021 20:23:37 +0000 (22:23 +0200)]
test: add pylint and test imports
Add pylint and test for unnecessary imports as a first step, which
requires cleaning them all up.
[rlb@defaultvalue.org: add and use ./pylint]
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sat, 7 Aug 2021 17:41:55 +0000 (12:41 -0500)]
Use intprops for INTEGRAL_ASSIGNMENT_FITS INTEGER_TO_PY uadd
Rewrite INTEGRAL_ASSIGNMENT_FITS, INTEGER_TO_PY, and uadd using
intprops, which also avoids needing all the custom (and historically
fragile) compiler option manipulations.
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sun, 1 Aug 2021 20:47:07 +0000 (15:47 -0500)]
config.vars.in: add CC so a configure CC will be the default
Add CC to config.vars.in (included by GNUMakefile) so that the CC
detected by ./configure will actually become the default. Previously
it would still reflect GNU make's default, even after something like
this:
CC=/some/where/gcc ./configure
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Wed, 18 Dec 2019 21:03:58 +0000 (22:03 +0100)]
git: teach git_config_get() to read from a file
We want to use git_config_get() to have a bup config file
in the future, so teach git_config_get() to read from a
file and add some tests for it.
Use this also to test the opttype conversions from the
previous patch.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Thu, 9 Jan 2020 12:27:35 +0000 (13:27 +0100)]
git: use git's int parsing with pack.packSizeLimit config
Our parse_num() understands a little more than git, in particular
* T for terabytes
* b suffix when you specify Kb, Mb, Gb or Tb.
Neither of those are understood by git, it only understands the
K, M and G suffixes (case-insensitive). However, a git repository
that actually states 'pack.packSizeLimit' as something that git
doesn't understand is broken for every single git command, and as
we call git, the added flexibility of parse_num() cannot be used.
Thus, simplify the code and just use opttype='int' for this.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Wed, 8 Jan 2020 21:48:25 +0000 (22:48 +0100)]
git: allow config retrieval as bool or int
Allow retrieving configuration values as bool or int,
letting 'git config' normalize all the values instead
of trying to do it ourselves in bup.
Also use git config --null to avoid having to worry about
any whitespace issues, although .strip() on the output
would probably work just as well. Previously, the result
would include a terminating newline written out by the
git config command, which is not desirable.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Tue, 28 Apr 2020 21:11:16 +0000 (23:11 +0200)]
hashsplit: increase READ_SIZE to 8 MB
It's not really possible to run bup with tiny amounts of memory,
so reading 1 MB or 8 MB doesn't make a significant difference
here.
However, python actually implements read() as mmap() (at least
on my Linux system), with the requested read size given to mmap
as the size. The kernel then doesn't appear to do any readahead
(which makes sense), which kills performance.
Even if this wasn't the case though, read() of 8MB isn't much
of an issue, so increase the size.
Note that 8 MB is also the size for the fadvise() code.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Tue, 28 Jan 2020 20:24:09 +0000 (21:24 +0100)]
save: refactor the code using helper classes
Instead of keeping three lists, refactor the code to use
a helper class for a folder being collected, and an item
in that folder being collected.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Mon, 1 Feb 2021 23:01:47 +0000 (00:01 +0100)]
bup: make demux errors clearer
If we hit the
assert(n <= MAX_PACKET)
in the demux code then quite likely we've been reading
something that shouldn't even be demuxed, but got some
error message from ssh instead of a muxed connection
record.
Clarify this case a bit by printing out the data that
we got (under the assumption it's an error message) and
raising Exception("Connection broken") instead of just
asserting.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Wed, 5 Feb 2020 21:24:01 +0000 (22:24 +0100)]
ls: read metadata only if needed
If we just want to get a list of files, there's no point in
reading metadata, since it simply isn't needed. Pass want_meta
to the appropriate functions only when we need the metadata,
and similarly call vfs.augment_item_meta() only then.
Note that the previous vfs change really made this effective,
we'd otherwise lose the information.
Note also that unfortunately this is necessary even for the
--file-type command line option because otherwise we cannot
identify FIFOs; for everything else the git mode appears to
be sufficient.
Together, this reduces the number of blob reads from 62 to 8
for 'bup ls' on a trivial folder (the bup git's root folder).
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Sun, 15 Mar 2020 21:38:15 +0000 (22:38 +0100)]
vfs: improve cache behaviour
If _commit_item_from_oid() is called first with require_meta=False,
and then again with require_meta=True, the second and further calls
will not use the cache, as the cached entry is without metadata.
Improve this by overwriting the cache entry if it couldn't be used.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Wed, 5 Feb 2020 21:21:18 +0000 (22:21 +0100)]
vfs: read metadata only if needed
If we get into contents(), we have an indication of whether or
not metadata is needed (the want_meta argument), but it doesn't
get passed down to revlist_items() and further down, so that in
cache_commit() we eventually call _revlist_item_from_oid() with
metadata always. This is wasteful.
Fix this by passing the information all the way down.
To make the caching work properly in this case, store a special
entry in the revlist dict (_HAS_META_ENTRY) indicating whether
or not metadata was cached, and if that's not set on a later
lookup, then don't return it if it doesn't have metadata but we
need the metadata.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Thu, 31 Dec 2020 22:10:05 +0000 (23:10 +0100)]
Test symlink target changes between stat and readlink
Test the changes in "metadata: fix symlink stat() vs. readlink() race".
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org>
[rlb@defaultvalue.org: adjust commit message; rework to use injection] Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Thu, 31 Dec 2020 22:29:58 +0000 (23:29 +0100)]
metadata: fix symlink stat() vs. readlink() race
We might stat() the file and get some size, but by the time
we readlink() the link has changed and the size is something
else.
Arguably, we can't really avoid races here if we don't have
a consistent snapshot of the filesystem to save, however, in
this case we later get an assertion failure when the data is
read back from the index (or repo), and it's easy to avoid.
Set the size from the actually recorded symlink target.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Thu, 31 Dec 2020 22:10:05 +0000 (23:10 +0100)]
Test file size changes during save
Test the changes in "save: fix race in data vs. metadata size".
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org>
[rlb@defaultvalue.org: adjust commit message; rework to use injection] Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Thu, 31 Dec 2020 22:20:53 +0000 (23:20 +0100)]
save: fix race in data vs. metadata size
Fix the race in data vs. metadata size by overriding the metadata
size with what we actually read and stored into the repository.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Wed, 30 Dec 2020 22:10:19 +0000 (23:10 +0100)]
midx: make passing idx files along with --dir work
If you do something like
bup midx --dir /some/dir/ ...
with some idx files ("..."), then things don't actually work
properly because --dir gets ignored in this case. Fix that.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Python 2 doesn't support them, and at least right now, regardless of
what the current python docs suggest, at the moment, they're just
trivial wrappers around malloc and free.
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Sun, 17 May 2020 20:03:24 +0000 (22:03 +0200)]
web: omit '.' link
There's no value in offering a link to go to the same place
you're already at, it's just clutter. Should it really be
necessary there's always a browser refresh instead.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Thu, 31 Dec 2020 22:33:03 +0000 (23:33 +0100)]
save: fix symlink target race
If the symlink target changes while save is running, we can end up
reading one target and recording it in the metadata, but then
recording a different one (with perhaps a different size) in the
blob.
Fix this by not reading the symlink again, but just using the one
we already have in the metadata.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Fri, 1 Jan 2021 10:04:59 +0000 (11:04 +0100)]
test: test index vs. save file type change
In this case, the item shouldn't be recorded at all.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
Johannes Berg [Sat, 2 Jan 2021 19:58:44 +0000 (20:58 +0100)]
save: skip/balk if an entry changed type since indexing
If an entry changed file type (link, regular file, ...) since
indexing, then all kinds of weird things can happen. Skip the
item in such cases and record an error.
This also requires adjusting the test that actually provokes
a failure in metadata read - now we don't store the file at
all, so modify the test to account for that behaviour in the
check.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Rob Browning <rlb@defaultvalue.org>
projects / bup.git / log