summaryrefslogtreecommitdiff
path: root/bin/bbackupd/BackupClientDirectoryRecord.cpp
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2008-02-02 08:31:52 +0100
committerReinhard Tartler <siretart@tauware.de>2008-02-02 08:31:52 +0100
commit2787035d98661881477d696403ca2a78b49322d5 (patch)
tree0a018e13726a0232332ac23565e1a7df32cdcc06 /bin/bbackupd/BackupClientDirectoryRecord.cpp
parent2733267954e91e394fbb512ea3abb4c497c0752f (diff)
import version 0.11rc2
This commit has been made by 'bzr import'. I used the upstream tarball of Version 0.11rc2 for creating it. It has the md5sum: 68052f963a944c717a50bd65a54375ff
Diffstat (limited to 'bin/bbackupd/BackupClientDirectoryRecord.cpp')
-rw-r--r--bin/bbackupd/BackupClientDirectoryRecord.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/bin/bbackupd/BackupClientDirectoryRecord.cpp b/bin/bbackupd/BackupClientDirectoryRecord.cpp
index 0d3300cb..0720b40c 100644
--- a/bin/bbackupd/BackupClientDirectoryRecord.cpp
+++ b/bin/bbackupd/BackupClientDirectoryRecord.cpp
@@ -1,11 +1,12 @@
-// distribution boxbackup-0.11rc1 (svn version: 2023_2024)
+// distribution boxbackup-0.11rc2 (svn version: 2072)
//
-// Copyright (c) 2003 - 2006
+// Copyright (c) 2003 - 2008
// Ben Summers and contributors. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
+//
// 1. Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// 2. Redistributions in binary form must reproduce the above copyright
@@ -314,9 +315,13 @@ void BackupClientDirectoryRecord::SyncDirectory(BackupClientDirectoryRecord::Syn
if(st.st_dev != dir_st.st_dev)
{
- rParams.GetProgressNotifier()
- .NotifyMountPointSkipped(this,
- filename);
+ if(!(rParams.mrContext.ExcludeDir(
+ filename)))
+ {
+ rParams.GetProgressNotifier()
+ .NotifyMountPointSkipped(
+ this, filename);
+ }
continue;
}