[Box Backup-commit] [boxbackup/boxbackup] 8197f4: Remove link and unlink macros on Windows.

Chris Wilson noreply at github.com
Tue Aug 27 21:23:17 BST 2019


  Branch: refs/heads/jamesog/cirrus-ci
  Home:   https://github.com/boxbackup/boxbackup
  Commit: 8197f4abd17c58c5af90985951bc13a3b32823a9
      https://github.com/boxbackup/boxbackup/commit/8197f4abd17c58c5af90985951bc13a3b32823a9
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2019-08-27 (Tue, 27 Aug 2019)

  Changed paths:
    M lib/backupclient/BackupClientRestore.cpp
    M lib/backupstore/BackupClientFileAttributes.cpp
    A lib/backupstore/BackupFileSystem.cpp
    M lib/backupstore/BackupStoreFile.cpp
    M lib/backupstore/BackupStoreRefCountDatabase.cpp
    M lib/bbackupd/BackupDaemon.cpp
    M lib/bbackupquery/BackupQueries.cpp
    M lib/common/InvisibleTempFileStream.cpp
    M lib/common/NamedLock.cpp
    M lib/common/Test.cpp
    M lib/raidfile/RaidFileWrite.cpp
    M lib/server/Daemon.cpp
    M lib/server/ServerControl.cpp
    M lib/server/ServerStream.h
    M lib/win32/emu.h
    M test/backupstore/testbackupstore.cpp
    M test/backupstorefix/testbackupstorefix.cpp
    M test/backupstorepatch/testbackupstorepatch.cpp
    M test/basicserver/testbasicserver.cpp
    M test/bbackupd/testbbackupd.cpp
    M test/httpserver/testhttpserver.cpp
    M test/raidfile/testraidfile.cpp

  Log Message:
  -----------
  Remove link and unlink macros on Windows.

They provided source-code compatibility with the POSIX versions of these
functions, but they conflict with Boost. Replace with EMU_LINK and
EMU_UNLINK everywhere.

(cherry picked from commit 29e267a5642f7eea2c4939ccd4624e3664158629)
(modified to apply to this branch, with some changes omitted as a result)


  Commit: c3084f98c44e0ce64521d2d1311b3c646fab0b58
      https://github.com/boxbackup/boxbackup/commit/c3084f98c44e0ce64521d2d1311b3c646fab0b58
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2019-08-27 (Tue, 27 Aug 2019)

  Changed paths:
    M lib/bbackupd/BackupClientDirectoryRecord.cpp
    M lib/bbackupd/BackupClientDirectoryRecord.h
    M test/bbackupd/testbbackupd.cpp

  Log Message:
  -----------
  BackupClientDirectoryRecord: improve logging of file move decisions

Also improve logging of directory listing download decisions.

test/bbackupd: increase verbosity in test_backup_hardlinked_files to help debug
test failures on Travis which I have not been able to reproduce locally.

(cherry-picked from ae4f2124714337c6d604722418c6f4521890a3fe, to help backport
25fc64e43c51254a989cb003809353795ab3ea35 from the s3_support branch).


  Commit: 774950245a72273eabec1c4ed02662d5bc6d2691
      https://github.com/boxbackup/boxbackup/commit/774950245a72273eabec1c4ed02662d5bc6d2691
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2019-08-27 (Tue, 27 Aug 2019)

  Changed paths:
    M lib/bbackupd/BackupDaemon.cpp

  Log Message:
  -----------
  BackupDaemon: failure to create remote directory is not a local issue

We treated exceptions raised while trying to create the remote directory for a
location as though they meant that we didn't have permission to access the
local directory, resulting in confusing error messages.

(cherry picked from commit a8ab83214673a66ebd5418097e1fd07f561a100f)


Compare: https://github.com/boxbackup/boxbackup/compare/d4cec93c59ab...774950245a72


More information about the Boxbackup-commit mailing list