Rob Browning [Sun, 10 Nov 2013 17:21:46 +0000 (11:21 -0600)]
_helpers.c: be smarter when converting unknown integer types to python.
For now assume that long long and unsigned long long are always the
the largest integer types, and convert unknown size integers to Python
via PyLong_FromUnsignedLongLong() or PyLong_FromLongLong(), depending
on the value's sign.
Thanks to Thomas Klausner <tk@giga.or.at> for reporting the problem
and helping track down the solution.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sun, 10 Nov 2013 20:11:44 +0000 (14:11 -0600)]
Makefile: avoid using -Werror with clang for now.
Apparently the default compiler on OS X and FreeBSD is now clang, and
it doesn't like our CHECK_VALUE_FITS() definition. So for now, just
don't specify -Werror when we detect clang.
Thanks to Alexander Barton <alex@barton.de>, Thomas Klausner
<tk@giga.or.at>, Sebastian Schumb <sebastian@sebastians-site.de>, and
Zoran Zaric <zz@zoranzaric.de> for reporting the problem.
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Alexander Barton <alex@barton.de>
Ben Kelly [Sat, 9 Nov 2013 19:21:04 +0000 (14:21 -0500)]
Add 'tag -f' support.
Add a new flag, -f/--force, to bup tag. By analogy with 'git tag',
'bup tag -f foo commit' will create tag *foo* even if a tag with that
name already exists; the existing tag will be silently overwritten.
By analogy with 'rm -f', add 'bup tag -d -f'. All this does is
suppress the error when you attempt to 'bup tag -d' a tag that doesn't
exist; it is primarily for use in scripts that want to delete a tag
that may or may not exist in the first place without 'bup tag'
reporting a failure.
Signed-off-by: Ben Kelly <btk@google.com>
[rlb@defaultvalue.org: add missing "tag" and wrap text in bup-tag.md;
put "-d" first in tag-cmd.py optspec line and bup-tag.md; adjust
commit message.] Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Fri, 8 Nov 2013 00:33:43 +0000 (18:33 -0600)]
index.py: compute the index metadata offset more carefully.
Previously when reading bupindex.meta (or similar), bup computed the
metadata file offset for it's internal lookup table by just
subtracting the size of a re-encoding of the metadata from file.tell()
after the read. This works fine until we change the length of the
metadata representation (which we just did); then bup will get the
wrong length from the re-encoded data.
To fix this, do what we should have done originally and capture the
index metadata offset before reading the metadata via tell(), and use
that instead.
Thanks to Mark J Hewitt <mjh@idnet.com> for being the first (known)
victim and for helping track down the solution.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Tue, 15 Oct 2013 19:20:10 +0000 (14:20 -0500)]
Add --map-user --map-group --map-uid and --map-gid options to restore.
Note that the usual metadata rules still appply, so a user or group
entry will normally take precedence over a uid/gid unless
--numeric-ids is specified. So if you want to map a uid, for example,
you'll either need --numeric-ids, or you'll need to clear the
user/group like this:
These options should also make it possible to recover from archives
that were broken as a result of our incorrect handling of
signed/unsigned stat values (recently fixed).
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Reviewed-by: Gabriel Filion <gabster@lelutin.ca>
Rob Browning [Sat, 12 Oct 2013 18:59:07 +0000 (13:59 -0500)]
Treat stat fields correctly as signed, unsigned, or unspecified (cf. POSIX).
Patrick reported a problem with restore on Cygwin that was being
caused by bup's handling of unknown uid/gid values; it turns out that
Cygwin returns -1 in that situation:
http://www.cygwin.com/cygwin-ug-net/ntsec.html
"Special values of user and group ids"
However, bup didn't see -1; bup saw 4294967295, because it was
incorrectly converting some stat field values as unsigned when POSIX
says that they should be signed (or doesn't specify):
To fix the problem, convert the stat fields correctly -- using the
widest type available (PY_LONG_LONG), and add a new common metadata
record (_rec_tag_common_v2) to store them correctly. Test at runtime
for potential overflows that we can't rule out at compile time.
Store all of the fields (excepting the timestamp ns values, which we
already force to be non-negative) as signed vints because the overhead
should be negligible, and doing so means that we won't have to break
backward compatibility again if we ever decide we actually want to
store negative values.
Continue to read the legacy format as before, with the realization
that this may leave some existing archives broken. At the moment, the
only known case is the Cygwin "unknown uid/gid" problem cited above,
and to help with that and similar cases, we'll be adding
--map-{user,group,uid,gid} options to restore.
Thanks to Patrick Rouleau <prouleau72@gmail.com> for the initial
report leading to the deeper problem.
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Reviewed-by: Gabriel Filion <gabster@lelutin.ca>
Thanks to Ben Kelly <btk@google.com> for tracking down the problem,
rather than Alexander Barton <alex@barton.de>.
Original message:
Author: Rob Browning <rlb@defaultvalue.org>
Date: Tue Nov 5 17:17:45 2013 -0600
Don't include atime when determining hardlink compatibility.
Don't include the atimes since we're comparing two paths stat()ed at
different times, and depending on the
platform/filesystem/mount-options, that may result in two different
atimes, even when the paths refer to the same file.
Thanks to Alexander Barton <alex@barton.de> for tracking down the
problem.
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Reviewed-by: Gabriel Filion <gabster@lelutin.ca> Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Tue, 5 Nov 2013 23:17:45 +0000 (17:17 -0600)]
Don't include atime when determining hardlink compatibility.
Don't include the atimes since we're comparing two paths stat()ed at
different times, and depending on the
platform/filesystem/mount-options, that may result in two different
atimes, even when the paths refer to the same file.
Thanks to Alexander Barton <alex@barton.de> for tracking down the
problem.
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Reviewed-by: Gabriel Filion <gabster@lelutin.ca>
Rob Browning [Tue, 5 Nov 2013 22:29:53 +0000 (16:29 -0600)]
Add current-filesystem and path-filesystems to t/lib.sh; use to guard test.
Add current-filesystem which reports the current filesystem type, and
path-filesystems which reports all the filesystems back up to the
root, and use the latter to skip the "save --strip-path (no match)"
test whenever all the filesystems involved aren't the same type.
This issue was discovered while testing on
/some/ext4/tree/containing/a/btrfs/tree. When the test indexes/saves,
it picks up the metadata for the parents above the btrfs, which may
have (for example) linux +e attrs. Then when it tries to restore the
tree fully within the btrfs, the restore defers an error when it tries
to restore the +e, which isn't valid for btrfs.
Normally we can avoid this problem via --strip, but this particular
test is actually checking the behavior when --strip doesn't apply.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Tue, 5 Nov 2013 22:17:04 +0000 (16:17 -0600)]
_apply_linux_xattr_rec(): do nothing if no rec; fix restricted access test.
If the metadata object has no linux_xattr, don't do anything at all in
_apply_linux_xattr_rec(), and don't test the filesystem for xattr
support to determine whether or not to expect an xattr error, because
EACCES trumps the other errors.
This should be more efficient and fix a
test_apply_to_path_restricted_access() failure.
Thanks to Sebastian Schumb <sebastian@sebastians-site.de> for
reporting the problem and helping track down the fix.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Mon, 4 Nov 2013 15:34:17 +0000 (09:34 -0600)]
test.sh: remove "wc -l" quoting until/unless we fix the broader issue.
On some platforms "wc -l" returns whitespace along with the count,
which breaks the one case where we quoted the result, i.e. "$(... | wc
-l"). For now, remove the quoting until/unless we decide to fix all
of the affected invocations.
Thanks to Thomas Klausner <tk@giga.or.at> for reporting the problem on
NetBSD.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sun, 27 Oct 2013 18:23:20 +0000 (13:23 -0500)]
Fix xattr tests and bugs revealed (fully remove set -e from test-meta.sh).
Fixing the xattr tests to run correctly pointed out that bup stops
trying to apply metadata after the first failure (i.e. after any
metadata record application fails). Change it so that bup always
tries every metadata record. Otherwise, bup may skip some forms of
metadata without any notification -- and it shouldn't. For example,
it shouldn't skip ACLs just because the current filesystem doesn't
support xattrs.
Fix two additional problems that were exposed by the changes described
above.
Check for EACCES when trying to apply an attr record, and properly
convert it to an ApplyError. This problem was revealed by
test_apply_to_path_restricted_access.
Check for EACCES when trying to read the current filesystem xattrs
during the process of applying the metadata xattrs, and when
encountered, convert it to an ApplyError.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sat, 26 Oct 2013 20:03:12 +0000 (15:03 -0500)]
Fix the "set -e" problem in the test-meta.sh chattr tests.
Start fixing the "set -e" problem, beginning with the test-meta.sh
chattr tests, and add support to the test filesystem for options
needed by the chattr calls.
To allow us to produce a more digestable sequence of patches for the
broader "set -e" problem, temporarily establish BUP_SKIP_BROKEN_TESTS
which will do what it says when set, and until we finish repairing
everything, it must be set during any testing:
BUP_SKIP_BROKEN_TESTS=1 make check
The fundamental issue with "set -e" is that it has some unexpected
(but documented) semantics. For example:
set -e
foo() { false; rm -rf /; }
# Effectively harmless
foo
# Erase the filesystem
foo || true
If nothing else, this behavior appears to have been masking test
failures. Better to just avoid "set -e" altogether.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Mon, 21 Oct 2013 20:57:40 +0000 (15:57 -0500)]
Don't create ACL objects until they're needed.
Previously bup would store the POSIX1e ACL information in metadata
objects as pylibacl objects. That meant bup would have to be able to
create those objects immediately when loading the metadata record.
Aside from being unnecessary, that was causing top-level crashes in
cases where the ACL object creation failed. That's because bup would
throw an exception (deferred via add_error()) without skipping the ACL
metadata record content. After that, all metadata reads would be out
of sync, resulting in erroneous reads, and an eventual EOFError.
To fix the problem, don't convert the encoded ACL data to pylibacl
objects until necessary (i.e. unless trying to apply the ACLs to the
filesystem via bup restore). With that change bup should no longer
get out of sync when reading the metadata, and in cases where it would
be impossible to create the pylibacl objects (i.e. the local machine's
user/groups won't allow it), bup won't just drop the metadata. For
example,
bup meta --edit --set-user rlb < metadata.old > metadata.new
will no longer silently drop ACL information in metadata.old on error.
Thanks to Anton Eliasson <devel@antoneliasson.se> for reporting the
problem and helping track it down.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Fri, 18 Oct 2013 23:30:01 +0000 (18:30 -0500)]
metadata_file(): don't load metadata objects for all the files in a dir.
When only asked for the .bupm via metdata_file(), don't also parse the
.bupm and create all the metadata objects for the dir. Aside from
being potentially wasteful, that may also make it impossible to
retrieve a broken .bupm via "cat-file --bupm" (for analysis).
Thanks to Anton Eliasson <devel@antoneliasson.se> for helping find the
problem and test the fix.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Fri, 18 Oct 2013 18:46:05 +0000 (13:46 -0500)]
Only forward signals when appropriate; on SIGTSTP suspend parent too.
Finish the main.py work, started in aa6f2c87e6f1292f1fa22f618532b65a5565d604, which began forwarding
SIGTSTP and SIGCONT to the child process so that it would
suspend/resume with the parent.
Only forward signals to the child when appropriate -- guarded by p and
forward_signals. After forwarding SIGTSTP (as SIGSTOP) to the child,
reset the SIGTSTP handler to its default behavior and re-send SIGTSTP
to the parent so that it will actually suspend too.
Thanks to Karl Kiniger <karl.kiniger@med.ge.com> for reporting the
problem.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sun, 6 Oct 2013 19:33:35 +0000 (14:33 -0500)]
bloom-cmd.py: close open file object for tfname before attempting a rename.
Ben Kelly reported a an IOException (permission denied) during "bup
bloom" on Cygwin. The exception was caused by the attempt to
os.rename(tfname, outfilename) in do_bloom().
This appears to be because Cygwin doesn't allow you to rename a file
while it's still open. At first, we thought this might be because
bloom.py create() opens tfname, passes the resulting file to ShaBloom,
and then no one ever explicitly closes it. So if the gc hasn't
collected the ShaBloom object before the rename, we're in trouble.
However, the problem may also have been caused by an unrelated process
scanning the file at the same time.
In any case, for the moment, explicitly close the ShaBloom object
before the rename. That shouldn't hurt, and may help.
Thanks to Ben Kelly <btk@google.com> for the report.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sat, 5 Oct 2013 18:01:37 +0000 (13:01 -0500)]
Handle EOPNOTSUPP as an indicator that Linux attrs are not supported.
Add EOPNOTSUPP to the set of errno values in _add_linux_attr() that
indicate Linux attrs are not supported by the target filesystem. The
problem was observed on ZFS-on-Linux, 0.6.2.
Thanks to Will Rouesnel <w.rouesnel@gmail.com> for the report and an
initial patch.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sat, 5 Oct 2013 01:58:07 +0000 (20:58 -0500)]
Be more careful when testing that repeated saves can produce the same tree.
Previously, test.sh would run multiple saves with no intervening
modifications, and check to see that the top-level "save -t" hash
didn't change, but with the addition of metadata this may fail on some
platforms where the test process itself (the save runs, etc.) affects
atime values. That's because save is pulling the metadata for
unindexed parent directories directly from the filesystem. And note
that atime is only special here because the test itself may
incidentally alter it -- we would see the same problem if any of the
other metdata for one of the unindexed parent directories changed
during the test run (i.e. mtime, uid, gid, ...).
To fix this, move the relevant test code from test.sh to
test-redundant-saves.sh, and use a newly added subdir-hash tool so
that we can compare the hashes of the roots of the indexed subtrees
instead of the top-level "save -t" hashes, ignoring the unindexed
parents entirely.
Thanks to Robert Edmonds <edmonds@debian.org> for running rc3 through
the Debian buildds which lead to the kFreeBSD test failure that
demonstrated the problem.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Fri, 20 Sep 2013 18:33:02 +0000 (13:33 -0500)]
Move non-system includes after system includes in _helpers.c.
Having Python.h before assert.h was apparently causing trouble on
OpenBSD:
_helpers.c: In function 'bup_xutime_ns':
_helpers.c:842: warning: implicit declaration of function 'utimensat'
_helpers.c:842: error: 'AT_FDCWD' undeclared (first use in this function)
_helpers.c:842: error: (Each undeclared identifier is reported only once
_helpers.c:842: error: for each function it appears in.)
_helpers.c:843: error: 'AT_SYMLINK_NOFOLLOW' undeclared (first use in this function)
error: command 'cc' failed with exit status 1
...and moving the non-sytem includes lower is reasonable anyway.
Thanks to Ryan Hinton <iobass@email.com> for the report.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Wed, 18 Sep 2013 17:20:28 +0000 (12:20 -0500)]
Ignore unimplemented metadata record during read (_rec_tag_nfsv4_acl).
Don't test for _rec_tag_nfsv4_acl and then try to call an
unimplemented method in Metadata.read(). Otherwise, if/when we do add
support, older versions of bup will choke on it.
Thanks to Alexander Barton <alex@barton.de> for pointing this out.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Tue, 17 Sep 2013 01:47:28 +0000 (20:47 -0500)]
Quash stat(2) st_rdev unless we're going to need it for mknod().
On some platforms (i.e. kFreeBSD), the st_rdev value isn't completely
stable. For example, given "date > foo; cp -a foo foo-2", the st_rdev
value may differ between the two files.
Since we only need the st_rdev value for the call to mknod() when
restoring character and block special files, set it to zero for
anything else.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Gabriel Filion [Sun, 8 Sep 2013 03:26:15 +0000 (23:26 -0400)]
Update bup-split(1); document -d, clarify the split "modes", and reorganize.
Update the synopsis, document the "-d DATE" option, and make a clearer
distinction between normal options and the options that select the
split "mode".
Signed-off-by: Gabriel Filion <gabster@lelutin.ca>
[rlb@defaultvalue.org: add dashes to seconds-since-epoch; adjust the
MODES text a bit and move -b down; make a few other edits and adjust
commit message.] Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sat, 14 Sep 2013 18:47:23 +0000 (13:47 -0500)]
Fix path ownership restoration problems on Cygwin.
It turns out that Cygwin won't allow you to chown() a path to an
unknown uid or gid, even when "root".
For now, make that a deferred error on Cygwin, rework the tests to
avoid it when possible, and disable the tests (on Cygwin) that require
it.
For the record, it appears that tar doesn't normally hit this problem
on Cygwin because it uses "geteuid() == 0" to detect super-user
status, which won't be true in the normal case, even if the user is an
administrator.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Mon, 16 Sep 2013 17:56:27 +0000 (12:56 -0500)]
Always fall back to socket()/bind() when os.mknod(...S_IFSOCK) fails.
Previously bup would use socket()/bind() instead of os.mknod(... |
stat.S_IFSOCK) on Cygwin, but this issue isn't Cygwin specific.
Remove the platform conditionalization, and fall back to
socket()/bind() any time mknod() fails with EINVAL.
Thanks to Robert Edmonds <edmonds@debian.org> for reporting the
relevant failure on a Debian kFreeBSD buildd.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Fri, 23 Aug 2013 03:57:03 +0000 (22:57 -0500)]
Stop interleaving stream and mmap IO operations when writing the index.
Previously bup would write the index via a simultaneous combination of
stream operations and mmap writes to non-overlapping, but adjacent
regions of the same file. This was causing index corruption in some
cases.
Instead, make an extra pass over the data in memory to precompute the
size of the final index section, which contains any 31+-bit offsets.
Then mmap and write the entire set of tables directly, avoiding the
need for simultaneous stream operations.
Reported-by: Alan Jenkins <alan.christopher.jenkins@gmail.com> Signed-off-by: Rob Browning <rlb@defaultvalue.org> Tested-by: Greg Troxel <gdt@lexort.com> Reviewed-by: Greg Troxel <gdt@lexort.com>
Christopher Meng [Sun, 25 Aug 2013 14:32:27 +0000 (10:32 -0400)]
Preserve filesystem timestamps during "make install".
A good idea regardless, and recommended by the Fedora and Debian
packaging guidelines.
From debian-policy:
The rationale is that there is some information conveyed by knowing
the age of the file, for example, you could recognize that some
documentation is very old by looking at the modification time, so it
would be nice if the modification time of the upstream source would
be preserved.
It should also help prevent unnecessary backup churn after upgrades.
Signed-off-by: Christopher Meng <cickumqt@gmail.com> Reviewed-by: Zoran Zaric <zz@zoranzaric.de> Tested-by: Zoran Zaric <zz@zoranzaric.de>
[rlb@defaultvalue.org: adjust commit message] Reviewed-by: Rob Browning <rlb@defaultvalue.org>
Kumar Appaiah [Sun, 25 Aug 2013 19:02:18 +0000 (15:02 -0400)]
Add -l and --human-readable options to "bup ls".
When -l is specified, include the size in bytes for each item.
When --human-readable is also specified, print sizes like 3.5K, 1.8G,
etc., instead of the exact byte count.
Signed-Off-By: Kumar Appaiah <a.kumar@alumni.iitm.ac.in> Reviewed-by: Zoran Zaric <zz@zoranzaric.de>
[rlb@defaultvalue.org: adjust commit message; adjust newlines; squash
two of Kumar's patches into this one.] Reviewed-by: Rob Browning <rlb@defaultvalue.org> Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Kumar Appaiah [Sun, 25 Aug 2013 19:02:16 +0000 (15:02 -0400)]
Add --human-readable option to "bup web".
When --human-readable is specified, print sizes like 3.5K, 1.8G,
etc., instead of the exact byte count.
Signed-Off-By: Kumar Appaiah <a.kumar@alumni.iitm.ac.in> Reviewed-by: Zoran Zaric <zz@zoranzaric.de>
[rlb@defaultvalue.org: adjust commit message; squash two of Kumar's
patches into this one.] Reviewed-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sun, 25 Aug 2013 22:33:42 +0000 (17:33 -0500)]
save-cmd.py: don't write an irrelevant and incomplete .bupm fragment.
When finishing up (leaving) a directory and preparing to store its
related tree in the repository, don't write the pending .bupm (which
is still incomplete) to the pack if we know the directory already
exists in the repository (i.e. when we're not going to write it
either).
This problem was discovered when Zoran noticed that two consecutive
saves without an intervening index could produce a repository with an
unreferenced blob (according to git fsck).
Reported-by: Zoran Zaric <zz@zoranzaric.de> Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Fri, 23 Aug 2013 17:23:17 +0000 (12:23 -0500)]
main.py: forward SIGTSTP/SIGCONT so "C-z" will actually suspend everything.
Catch and forward SIGTSTP (as SIGSTOP) and SIGCONT to the subprocess
as we already do for SIGTERM and SIGINT so that the subprocess will
also suspend/resume.
This still leaves bup with potentially unexpected behavior since the
(detached) subprocess will never see a SIGSTOP delivered to the parent
(because SIGSTOP can't be intercepted and forwarded). This is due to
the os.setsid() call that was originally introduced to support current
newliner arrangement (cf. b7a524ccb662c9ed3ebd786da0f45f459929ef45).
Thanks to Kalle for the report.
Reported-by: krichter722@aol.de Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Zoran Zaric [Mon, 12 Aug 2013 14:20:12 +0000 (16:20 +0200)]
git.py: don't automatically initialize ~/.bup if it doesn't exist.
bup had a convenience feature where commands would automagically
initialize a repo in ~/.bup if it didn't exist and no other BUP_DIR
was given.
This had the odd effect that when one forgot to specify BUP_DIR, a bup
repo would be initialized in ~/.bup even though only a browsing
command was used.
This patch drops that behaviour. Now all repositories must be
explicitly intiialized via "bup init".
Signed-off-by: Zoran Zaric <zz@zoranzaric.de>
[rlb@defaultvalue.org: edit commit message; fix test ("set +e" during
init run).] Signed-off-by: Rob Browning <rlb@defaultvalue.org>
web-cmd.py: add a tornado import guard like the one for fuse in fuse-cmd.py.
In Debian, we replace the embedded copy of tornado with a Recommends on
the python-tornado package. Print a nice error message instead of a
backtrace if the user doesn't have it installed.
Signed-off-by: Robert S. Edmonds <edmonds@debian.org>
[rlb@defaultvalue.org: edited commit and error message] Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sun, 4 Aug 2013 18:39:55 +0000 (13:39 -0500)]
t/compare-trees: check rsync capability support correctly.
Handle older versions of rsync (where nothing was printed), and for
newer versions, check for "no FOO" rather than "FOO", since FOO will
always be listed one way or the other.
Signed-off-by: Gonéri Le Bouder <goneri@rulezlan.org>
[rlb@defaultvalue.org: adjust indentation, comments, and message.] Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Wed, 31 Jul 2013 16:32:17 +0000 (11:32 -0500)]
_create_via_common_rec: treat rmdir() EEXIST like ENOTEMPTY.
See rmdir(2):
ENOTEMPTY
pathname contains entries other than . and .. ; or,
pathname has .. as its final component. POSIX.1-2001
also allows EEXIST for this condition.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Thu, 4 Jul 2013 19:12:22 +0000 (14:12 -0500)]
config/configure: add and use bup_find_prog; remove unused MF_PATH_INCLUDEs.
Pull all the common program search code into bup_find_prog() and use
it everywhere. This also makes configure's output a bit more
consistent in style/content.
Make it obvious that at the moment bup doesn't pay any attention to a
PYTHON or GIT environment variable value. i.e. bup currently ignores a
setting like PYTHON=python2.7.
Bup also doesn't use MF_PATH_INCLUDE settings yet, so remove them.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sat, 8 Jun 2013 15:25:33 +0000 (10:25 -0500)]
git.py: flush idx_map before close so FILE* operations will see changes.
Flush idx_map (msync()) before closing it, since it doesn't look like
POSIX guarantees that a matching FILE* (i.e. idx_f) will see the
parallel changes if we don't.
From the original report:
After `bup save`, `git fsck` would show messages like
"Packfile index for %s SHA1 mismatch"
This indicated a bad trailing checksum on the pack index file.
Signed-off-by: Rob Browning <rlb@defaultvalue.org> Reported-by: Alan Jenkins <alan.christopher.jenkins@gmail.com> Reviewed-by: Alan Jenkins <alan.christopher.jenkins@gmail.com> Tested-by: Alan Jenkins <alan.christopher.jenkins@gmail.com>
projects / bup.git / log