From boxbackup-dev at fluffy.co.uk Sun Jun 3 15:37:48 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Sun, 03 Jun 2007 15:37:48 +0100 Subject: [Box Backup-commit] COMMIT r1694 - box/chris/merge/lib/common Message-ID: Author: chris Date: 2007-06-03 15:37:48 +0100 (Sun, 03 Jun 2007) New Revision: 1694 Modified: box/chris/merge/lib/common/EventWatchFilesystemObject.cpp Log: Add missing #include , thanks Tobias. Modified: box/chris/merge/lib/common/EventWatchFilesystemObject.cpp =================================================================== --- box/chris/merge/lib/common/EventWatchFilesystemObject.cpp 2007-05-26 17:35:54 UTC (rev 1693) +++ box/chris/merge/lib/common/EventWatchFilesystemObject.cpp 2007-06-03 14:37:48 UTC (rev 1694) @@ -9,6 +9,7 @@ #include "Box.h" +#include #include #ifdef HAVE_UNISTD_H From boxbackup-dev at fluffy.co.uk Mon Jun 4 22:13:34 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Mon, 04 Jun 2007 22:13:34 +0100 Subject: [Box Backup-commit] COMMIT r1695 - box/chris/merge/lib/server Message-ID: Author: chris Date: 2007-06-04 22:13:34 +0100 (Mon, 04 Jun 2007) New Revision: 1695 Modified: box/chris/merge/lib/server/Daemon.cpp Log: Hopefully reset getopt in a way that's compatible with BSD and GLIBC, thanks to Tobias Balle-Petersen for pointing out this bug. Modified: box/chris/merge/lib/server/Daemon.cpp =================================================================== --- box/chris/merge/lib/server/Daemon.cpp 2007-06-03 14:37:48 UTC (rev 1694) +++ box/chris/merge/lib/server/Daemon.cpp 2007-06-04 21:13:34 UTC (rev 1695) @@ -110,8 +110,17 @@ #endif char c; - optind = 0; // just in case anybody used getopt before + // reset getopt, just in case anybody used it before. + // unfortunately glibc and BSD differ on this point! + // http://www.ussg.iu.edu/hypermail/linux/kernel/0305.3/0262.html + #ifdef __GLIBC__ + optind = 1; + #else + optind = 0; + optreset = 1; + #endif + while((c = getopt(argc, (char * const *)argv, "c:DqvVt:Tk")) != -1) { switch(c) From boxbackup-dev at fluffy.co.uk Mon Jun 4 22:17:08 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Mon, 04 Jun 2007 22:17:08 +0100 Subject: [Box Backup-commit] COMMIT r1696 - box/chris/merge/lib/server Message-ID: Author: chris Date: 2007-06-04 22:17:08 +0100 (Mon, 04 Jun 2007) New Revision: 1696 Modified: box/chris/merge/lib/server/Daemon.cpp Log: Get it right this time. Modified: box/chris/merge/lib/server/Daemon.cpp =================================================================== --- box/chris/merge/lib/server/Daemon.cpp 2007-06-04 21:13:34 UTC (rev 1695) +++ box/chris/merge/lib/server/Daemon.cpp 2007-06-04 21:17:08 UTC (rev 1696) @@ -115,9 +115,9 @@ // unfortunately glibc and BSD differ on this point! // http://www.ussg.iu.edu/hypermail/linux/kernel/0305.3/0262.html #ifdef __GLIBC__ + optind = 0; + #else optind = 1; - #else - optind = 0; optreset = 1; #endif From boxbackup-dev at fluffy.co.uk Thu Jun 14 21:05:10 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Thu, 14 Jun 2007 20:05:10 -0000 Subject: [Box Backup-commit] Re: #25: No license.txt in boxbackup-chris_general_1569-backup-client-mingw32 In-Reply-To: <051.3f806d08d3af92fbb982cd6f77a0ba0f@fluffy.co.uk> References: <051.3f806d08d3af92fbb982cd6f77a0ba0f@fluffy.co.uk> Message-ID: <060.a61ad85f4a520cb6783701a715725834@fluffy.co.uk> #25: No license.txt in boxbackup-chris_general_1569-backup-client-mingw32 ----------------------------+----------------------------------------------- Reporter: petej | Owner: chris Type: defect | Status: assigned Priority: normal | Milestone: 0.11 Component: documentation | Version: 0.10 Resolution: | Keywords: win32 documentation docs license ----------------------------+----------------------------------------------- Comment (by petej): Replying to [comment:2 chris]: > Fixed in my tree, thanks! Hi Chris, I was just putting 1692 into my !InstallJammer installer, and I notice that the LICENSE.txt file doesn't have Windows line terminators, I think (it opens in Notepad as one big wrapped blog with white boxes strewn throughout). I'll attach what I think is a better one for your consideration. Thanks, Pete -- Ticket URL: Box Backup An open source, completely automatic on-line backup system for UNIX. From boxbackup-dev at fluffy.co.uk Tue Jun 19 22:38:47 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Tue, 19 Jun 2007 22:38:47 +0100 Subject: [Box Backup-commit] COMMIT r1697 - box/trunk/lib/common Message-ID: Author: chris Date: 2007-06-19 22:38:47 +0100 (Tue, 19 Jun 2007) New Revision: 1697 Modified: box/trunk/lib/common/Test.h Log: Add missing include of header (merges [1227]) Modified: box/trunk/lib/common/Test.h =================================================================== --- box/trunk/lib/common/Test.h 2007-06-04 21:17:08 UTC (rev 1696) +++ box/trunk/lib/common/Test.h 2007-06-19 21:38:47 UTC (rev 1697) @@ -20,7 +20,8 @@ #endif #include - +#include + extern int failures; #define TEST_FAIL_WITH_MESSAGE(msg) {failures++; printf("FAILURE: " msg " at " __FILE__ "(%d)\n", __LINE__);} From boxbackup-dev at fluffy.co.uk Wed Jun 20 22:28:13 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Wed, 20 Jun 2007 22:28:13 +0100 Subject: [Box Backup-commit] COMMIT r1698 - box/trunk/infrastructure Message-ID: Author: chris Date: 2007-06-20 22:28:13 +0100 (Wed, 20 Jun 2007) New Revision: 1698 Modified: box/trunk/infrastructure/buildenv-testmain-template.cpp Log: Include to avoid compile failures on BSD, thanks James O'Gorman. Modified: box/trunk/infrastructure/buildenv-testmain-template.cpp =================================================================== --- box/trunk/infrastructure/buildenv-testmain-template.cpp 2007-06-19 21:38:47 UTC (rev 1697) +++ box/trunk/infrastructure/buildenv-testmain-template.cpp 2007-06-20 21:28:13 UTC (rev 1698) @@ -30,6 +30,8 @@ #include #endif +#include + #include "MemLeakFindOn.h" int test(int argc, const char *argv[]); From boxbackup-dev at fluffy.co.uk Wed Jun 20 22:29:56 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Wed, 20 Jun 2007 22:29:56 +0100 Subject: [Box Backup-commit] COMMIT r1699 - box/chris/merge/infrastructure Message-ID: Author: chris Date: 2007-06-20 22:29:55 +0100 (Wed, 20 Jun 2007) New Revision: 1699 Modified: box/chris/merge/infrastructure/buildenv-testmain-template.cpp Log: Include to avoid compile failures on BSD, thanks James O'Gorman. (refs #3, merges [1698]) Modified: box/chris/merge/infrastructure/buildenv-testmain-template.cpp =================================================================== --- box/chris/merge/infrastructure/buildenv-testmain-template.cpp 2007-06-20 21:28:13 UTC (rev 1698) +++ box/chris/merge/infrastructure/buildenv-testmain-template.cpp 2007-06-20 21:29:55 UTC (rev 1699) @@ -38,6 +38,8 @@ #include #endif +#include + #include "Logging.h" #include "Test.h" #include "Timer.h" From boxbackup-dev at fluffy.co.uk Wed Jun 20 22:32:06 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Wed, 20 Jun 2007 22:32:06 +0100 Subject: [Box Backup-commit] COMMIT r1700 - box/chris/general/infrastructure Message-ID: Author: chris Date: 2007-06-20 22:32:06 +0100 (Wed, 20 Jun 2007) New Revision: 1700 Modified: box/chris/general/infrastructure/buildenv-testmain-template.cpp Log: Include to avoid compile failures on BSD, thanks James O'Gorman. (merges [1698], [1699]) Modified: box/chris/general/infrastructure/buildenv-testmain-template.cpp =================================================================== --- box/chris/general/infrastructure/buildenv-testmain-template.cpp 2007-06-20 21:29:55 UTC (rev 1699) +++ box/chris/general/infrastructure/buildenv-testmain-template.cpp 2007-06-20 21:32:06 UTC (rev 1700) @@ -38,6 +38,8 @@ #include #endif +#include + #include "Logging.h" #include "Test.h" #include "Timer.h" From boxbackup-dev at fluffy.co.uk Thu Jun 21 08:34:07 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Thu, 21 Jun 2007 08:34:07 +0100 Subject: [Box Backup-commit] COMMIT r1701 - box/chris/general Message-ID: Author: chris Date: 2007-06-21 08:34:07 +0100 (Thu, 21 Jun 2007) New Revision: 1701 Modified: box/chris/general/parcels.txt Log: Build server parcel on Windows too, since some people want it. Modified: box/chris/general/parcels.txt =================================================================== --- box/chris/general/parcels.txt 2007-06-20 21:32:06 UTC (rev 1700) +++ box/chris/general/parcels.txt 2007-06-21 07:34:07 UTC (rev 1701) @@ -21,15 +21,9 @@ optional script /bin/pcreposix.dll END-ONLY -OMIT:mingw32 -OMIT:mingw32msvc -OMIT:CYGWIN - backup-server bin bbstored bin bbstoreaccounts script bin/bbstored/bbstored-certs script bin/bbstored/bbstored-config script lib/raidfile/raidfile-config - -END-OMIT From boxbackup-dev at fluffy.co.uk Wed Jun 27 20:16:56 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Wed, 27 Jun 2007 20:16:56 +0100 Subject: [Box Backup-commit] COMMIT r1702 - box/chris/merge/infrastructure Message-ID: Author: chris Date: 2007-06-27 20:16:56 +0100 (Wed, 27 Jun 2007) New Revision: 1702 Modified: box/chris/merge/infrastructure/makedistribution.pl.in Log: Handle USE_SVN_VERSION in distribution VERSION files. Modified: box/chris/merge/infrastructure/makedistribution.pl.in =================================================================== --- box/chris/merge/infrastructure/makedistribution.pl.in 2007-06-21 07:34:07 UTC (rev 1701) +++ box/chris/merge/infrastructure/makedistribution.pl.in 2007-06-27 19:16:56 UTC (rev 1702) @@ -1,3 +1,4 @@ +#!/usr/bin/perl #!@PERL@ use strict; use Symbol; @@ -36,6 +37,29 @@ die "Archive name '$archive_name' is not equal to the distribution name '$distribution'" unless $archive_name eq $distribution; +my $svnversion = `svnversion .`; +chomp $svnversion; +$svnversion =~ tr/0-9A-Za-z/_/c; + +if($version =~ /USE_SVN_VERSION/) +{ + # for developers, use SVN version + open INFO,'svn info . |'; + my $svnurl; + while() + { + if(m/^URL: (.+?)[\n\r]+/) + { + $svnurl = $1; + } + } + close INFO; + $svnurl =~ m'box/(.+)$'; + my $svndir = $1; + $svndir =~ tr/0-9A-Za-z/_/c; + $version =~ s/USE_SVN_VERSION/$svndir.'_'.$svnversion/e; +} + # make initial directory my $base_name = "$archive_name-$version"; system "rm -rf $base_name"; @@ -47,8 +71,6 @@ my $license_f; read LICENSE,$license_f,100000; close LICENSE; -my $svnversion = `svnversion .`; -chomp $svnversion; my @license = ('distribution '.$base_name.' (svn version: '.$svnversion.')',split(/\n/,$license_f)); # copy files, make a note of all the modules included From boxbackup-dev at fluffy.co.uk Wed Jun 27 20:17:30 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Wed, 27 Jun 2007 20:17:30 +0100 Subject: [Box Backup-commit] COMMIT r1703 - box/chris/merge/distribution/boxbackup Message-ID: Author: chris Date: 2007-06-27 20:17:30 +0100 (Wed, 27 Jun 2007) New Revision: 1703 Modified: box/chris/merge/distribution/boxbackup/VERSION.txt Log: Use SVN version in distributions built from this branch. Modified: box/chris/merge/distribution/boxbackup/VERSION.txt =================================================================== --- box/chris/merge/distribution/boxbackup/VERSION.txt 2007-06-27 19:16:56 UTC (rev 1702) +++ box/chris/merge/distribution/boxbackup/VERSION.txt 2007-06-27 19:17:30 UTC (rev 1703) @@ -1,2 +1,2 @@ -0.09_plus3 +0.10_plus_USE_SVN_VERSION boxbackup From boxbackup-dev at fluffy.co.uk Wed Jun 27 20:17:57 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Wed, 27 Jun 2007 20:17:57 +0100 Subject: [Box Backup-commit] COMMIT r1704 - box/chris/merge/distribution/boxbackup Message-ID: Author: chris Date: 2007-06-27 20:17:57 +0100 (Wed, 27 Jun 2007) New Revision: 1704 Modified: box/chris/merge/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt Log: Add lib/intercept to distribution manifest, to ensure that it gets distributed. Modified: box/chris/merge/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt =================================================================== --- box/chris/merge/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt 2007-06-27 19:17:30 UTC (rev 1703) +++ box/chris/merge/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt 2007-06-27 19:17:57 UTC (rev 1704) @@ -1,3 +1,4 @@ +lib/intercept lib/raidfile test/raidfile test/raidfile/testfiles @@ -37,4 +38,4 @@ NO-LICENSE-IN-DIR infrastructure/msvc/2003 infrastructure/msvc/2003 NO-LICENSE-IN-DIR infrastructure/msvc/2005 -infrastructure/msvc/2005 \ No newline at end of file +infrastructure/msvc/2005 From boxbackup-dev at fluffy.co.uk Wed Jun 27 20:54:54 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Wed, 27 Jun 2007 20:54:54 +0100 Subject: [Box Backup-commit] COMMIT r1705 - box/chris/merge/infrastructure Message-ID: Author: chris Date: 2007-06-27 20:54:54 +0100 (Wed, 27 Jun 2007) New Revision: 1705 Modified: box/chris/merge/infrastructure/BoxPlatform.pm.in Log: Handle USE_SVN_VERSION in the middle of a version string. Modified: box/chris/merge/infrastructure/BoxPlatform.pm.in =================================================================== --- box/chris/merge/infrastructure/BoxPlatform.pm.in 2007-06-27 19:17:57 UTC (rev 1704) +++ box/chris/merge/infrastructure/BoxPlatform.pm.in 2007-06-27 19:54:54 UTC (rev 1705) @@ -51,7 +51,7 @@ $product_name = ; chomp $product_name; close VERSION; - if($product_version eq 'USE_SVN_VERSION') + if($product_version =~ /USE_SVN_VERSION/) { # for developers, use SVN version my $svnversion = `svnversion .`; @@ -70,7 +70,7 @@ $svnurl =~ m!box/(.+)$!; my $svndir = $1; $svndir =~ tr/0-9A-Za-z/_/c; - $product_version = $svndir.'_'.$svnversion; + $product_version =~ s/USE_SVN_VERSION/$svndir.'_'.$svnversion/e; } # where to put the files From boxbackup-dev at fluffy.co.uk Wed Jun 27 21:18:44 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Wed, 27 Jun 2007 21:18:44 +0100 Subject: [Box Backup-commit] COMMIT r1706 - box/chris/merge/infrastructure Message-ID: Author: chris Date: 2007-06-27 21:18:43 +0100 (Wed, 27 Jun 2007) New Revision: 1706 Modified: box/chris/merge/infrastructure/makedistribution.pl.in Log: Replace version in VERSION.txt, if it contains USE_SVN_VERSION. Modified: box/chris/merge/infrastructure/makedistribution.pl.in =================================================================== --- box/chris/merge/infrastructure/makedistribution.pl.in 2007-06-27 19:54:54 UTC (rev 1705) +++ box/chris/merge/infrastructure/makedistribution.pl.in 2007-06-27 20:18:43 UTC (rev 1706) @@ -136,6 +136,7 @@ or die "Copy of root extra files failed"; unlink "$base_name/DISTRIBUTION-MANIFEST.txt" or die "Delete of DISTRIBUTION-MANIFEST.txt file failed"; +replace_version_in("VERSION.txt"); # produce a new modules file my $modules = gensym; @@ -338,6 +339,7 @@ while() { s/###DISTRIBUTION-VERSION-NUMBER###/$version/g; + s/.*USE_SVN_VERSION.*/$version/g; print OUT } From boxbackup-dev at fluffy.co.uk Thu Jun 28 20:54:45 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Thu, 28 Jun 2007 20:54:45 +0100 Subject: [Box Backup-commit] COMMIT r1707 - box/chris/merge/lib/server Message-ID: Author: chris Date: 2007-06-28 20:54:45 +0100 (Thu, 28 Jun 2007) New Revision: 1707 Modified: box/chris/merge/lib/server/Daemon.cpp box/chris/merge/lib/server/Daemon.h Log: Add a new -F option for daemons, which runs in the foreground but still accepts multiple connections, unlike -D or SINGLEPROCESS. Modified: box/chris/merge/lib/server/Daemon.cpp =================================================================== --- box/chris/merge/lib/server/Daemon.cpp 2007-06-27 20:18:43 UTC (rev 1706) +++ box/chris/merge/lib/server/Daemon.cpp 2007-06-28 19:54:45 UTC (rev 1707) @@ -53,6 +53,7 @@ mReloadConfigWanted(false), mTerminateWanted(false), mSingleProcess(false), + mRunInForeground(false), mKeepConsoleOpenAfterFork(false) { if(spDaemon != NULL) @@ -121,7 +122,7 @@ optreset = 1; #endif - while((c = getopt(argc, (char * const *)argv, "c:DqvVt:Tk")) != -1) + while((c = getopt(argc, (char * const *)argv, "c:DFqvVt:Tk")) != -1) { switch(c) { @@ -138,6 +139,12 @@ } break; + case 'F': + { + mRunInForeground = true; + } + break; + case 'q': { if(masterLevel == Log::NOTHING) @@ -250,7 +257,7 @@ mConfigFileName = rConfigFileName; - bool asDaemon = !mSingleProcess; + bool asDaemon = !mSingleProcess && !mRunInForeground; try { Modified: box/chris/merge/lib/server/Daemon.h =================================================================== --- box/chris/merge/lib/server/Daemon.h 2007-06-27 20:18:43 UTC (rev 1706) +++ box/chris/merge/lib/server/Daemon.h 2007-06-28 19:54:45 UTC (rev 1707) @@ -79,6 +79,7 @@ bool mReloadConfigWanted; bool mTerminateWanted; bool mSingleProcess; + bool mRunInForeground; bool mKeepConsoleOpenAfterFork; static Daemon *spDaemon; }; From boxbackup-dev at fluffy.co.uk Thu Jun 28 21:54:28 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Thu, 28 Jun 2007 21:54:28 +0100 Subject: [Box Backup-commit] COMMIT r1708 - box/chris/merge/lib/server Message-ID: Author: chris Date: 2007-06-28 21:54:28 +0100 (Thu, 28 Jun 2007) New Revision: 1708 Modified: box/chris/merge/lib/server/SocketStream.cpp Log: Log reasons for failure to connect to a socket. Modified: box/chris/merge/lib/server/SocketStream.cpp =================================================================== --- box/chris/merge/lib/server/SocketStream.cpp 2007-06-28 19:54:45 UTC (rev 1707) +++ box/chris/merge/lib/server/SocketStream.cpp 2007-06-28 20:54:28 UTC (rev 1708) @@ -15,6 +15,7 @@ #include #include +#include #ifndef WIN32 #include @@ -164,6 +165,10 @@ #else ::close(mSocketHandle); #endif + BOX_ERROR("Failed to connect to socket (type " << Type << + ", name " << Name << ", port " << Port << "): " << + "error " << errno << " (" << strerror(errno) << + ")"); mSocketHandle = INVALID_SOCKET_VALUE; THROW_EXCEPTION(ConnectionException, Conn_SocketConnectError) } From boxbackup-dev at fluffy.co.uk Fri Jun 29 12:57:48 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Fri, 29 Jun 2007 11:57:48 -0000 Subject: [Box Backup-commit] #30: Create more friendly build targets Message-ID: <053.76fbb316d3565827b21b4db506bfaa9d@fluffy.co.uk> #30: Create more friendly build targets -------------------------------+-------------------------------------------- Reporter: jamesog | Owner: Type: enhancement | Status: new Priority: normal | Milestone: 0.11 Component: scripts | Version: trunk Keywords: Makefile, scripts | -------------------------------+-------------------------------------------- Currently the build scripts generate the Makefile which makes build targets called * parcels/''$product_name''-''$product_version''-client-''$target_os'' * parcels/''$product_name''-''$product_version''-server-''$target_os'' These aren't very nice to type when building just one component. The attached patch makes two new targets (build-backup-client, build-backup- server) which depend on these existing ones. -- Ticket URL: Box Backup An open source, completely automatic on-line backup system for UNIX. From boxbackup-dev at fluffy.co.uk Sat Jun 30 12:22:08 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Sat, 30 Jun 2007 12:22:08 +0100 Subject: [Box Backup-commit] COMMIT r1709 - box/chris/merge/infrastructure Message-ID: Author: chris Date: 2007-06-30 12:22:08 +0100 (Sat, 30 Jun 2007) New Revision: 1709 Modified: box/chris/merge/infrastructure/makeparcels.pl.in Log: Improved build targets, thanks to James O'Gorman (fixes #30) Modified: box/chris/merge/infrastructure/makeparcels.pl.in =================================================================== --- box/chris/merge/infrastructure/makeparcels.pl.in 2007-06-28 20:54:28 UTC (rev 1708) +++ box/chris/merge/infrastructure/makeparcels.pl.in 2007-06-30 11:22:08 UTC (rev 1709) @@ -78,7 +78,7 @@ __E -print MAKE "all:\t",join(' ',map {parcel_target($_)} @parcels),"\n\n"; +print MAKE "all:\t",join(' ',map {"build-".$_} @parcels),"\n\n"; print MAKE "clean:\n"; for my $parcel (@parcels) @@ -95,6 +95,7 @@ for my $parcel (@parcels) { my $target = parcel_target($parcel); + print MAKE "build-$parcel:\t$target\n\n"; print MAKE $target,":\n"; my $dir = parcel_dir($parcel); From boxbackup-dev at fluffy.co.uk Sat Jun 30 12:22:56 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Sat, 30 Jun 2007 12:22:56 +0100 Subject: [Box Backup-commit] COMMIT r1710 - box/chris/general/infrastructure Message-ID: Author: chris Date: 2007-06-30 12:22:56 +0100 (Sat, 30 Jun 2007) New Revision: 1710 Modified: box/chris/general/infrastructure/makeparcels.pl.in Log: Improved build targets, thanks to James O'Gorman (merges [1709], fixes #30) Modified: box/chris/general/infrastructure/makeparcels.pl.in =================================================================== --- box/chris/general/infrastructure/makeparcels.pl.in 2007-06-30 11:22:08 UTC (rev 1709) +++ box/chris/general/infrastructure/makeparcels.pl.in 2007-06-30 11:22:56 UTC (rev 1710) @@ -78,7 +78,7 @@ __E -print MAKE "all:\t",join(' ',map {parcel_target($_)} @parcels),"\n\n"; +print MAKE "all:\t",join(' ',map {"build-".$_} @parcels),"\n\n"; print MAKE "clean:\n"; for my $parcel (@parcels) @@ -95,6 +95,7 @@ for my $parcel (@parcels) { my $target = parcel_target($parcel); + print MAKE "build-$parcel:\t$target\n\n"; print MAKE $target,":\n"; my $dir = parcel_dir($parcel); From boxbackup-dev at fluffy.co.uk Sat Jun 30 12:53:15 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Sat, 30 Jun 2007 12:53:15 +0100 Subject: [Box Backup-commit] COMMIT r1711 - box/chris/merge/lib/server Message-ID: Author: chris Date: 2007-06-30 12:53:15 +0100 (Sat, 30 Jun 2007) New Revision: 1711 Modified: box/chris/merge/lib/server/Daemon.cpp Log: Add extra debugging to help find out why getopt is behaving weirdly on debian etch (http://lists.warhead.org.uk/pipermail/boxbackup/2007-June/003603.html) Modified: box/chris/merge/lib/server/Daemon.cpp =================================================================== --- box/chris/merge/lib/server/Daemon.cpp 2007-06-30 11:22:56 UTC (rev 1710) +++ box/chris/merge/lib/server/Daemon.cpp 2007-06-30 11:53:15 UTC (rev 1711) @@ -124,6 +124,12 @@ while((c = getopt(argc, (char * const *)argv, "c:DFqvVt:Tk")) != -1) { + BOX_TRACE("getopt: returned '" << c << "'"); + BOX_TRACE("getopt: optind = " << optind); + BOX_TRACE("getopt: optopt = " << optopt); + BOX_TRACE("getopt: optarg = " << optarg); + BOX_TRACE("getopt: argv[optind] = " << argv[optind]); + switch(c) { case 'c': @@ -212,6 +218,8 @@ } } + BOX_TRACE("getopt: returned " << (int)c << ", finished."); + if (argc > optind && !haveConfigFile) { mConfigFileName = argv[optind]; optind++; From boxbackup-dev at fluffy.co.uk Sat Jun 30 14:32:53 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Sat, 30 Jun 2007 14:32:53 +0100 Subject: [Box Backup-commit] COMMIT r1712 - box/trunk/infrastructure Message-ID: Author: jamesog Date: 2007-06-30 14:32:53 +0100 (Sat, 30 Jun 2007) New Revision: 1712 Modified: box/trunk/infrastructure/makeparcels.pl.in Log: Implement two new build targets: * build-backup-client * build-backup-server These depend on the existing client/server parcel targets but are easier on the eye. Refs and fixes #30. Modified: box/trunk/infrastructure/makeparcels.pl.in =================================================================== --- box/trunk/infrastructure/makeparcels.pl.in 2007-06-30 11:53:15 UTC (rev 1711) +++ box/trunk/infrastructure/makeparcels.pl.in 2007-06-30 13:32:53 UTC (rev 1712) @@ -78,7 +78,7 @@ __E -print MAKE "all:\t",join(' ',map {parcel_target($_)} @parcels),"\n\n"; +print MAKE "all:\t",join(' ',map {"build-".$_} @parcels),"\n\n"; print MAKE "clean:\n"; for my $parcel (@parcels) @@ -95,6 +95,7 @@ for my $parcel (@parcels) { my $target = parcel_target($parcel); + print MAKE "build-$parcel:\t$target\n\n"; print MAKE $target,":\n"; my $dir = parcel_dir($parcel); From boxbackup-dev at fluffy.co.uk Sat Jun 30 15:17:17 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Sat, 30 Jun 2007 15:17:17 +0100 Subject: [Box Backup-commit] COMMIT r1713 - box/chris/merge/test/bbackupd Message-ID: Author: chris Date: 2007-06-30 15:17:17 +0100 (Sat, 30 Jun 2007) New Revision: 1713 Modified: box/chris/merge/test/bbackupd/testbbackupd.cpp Log: Make test/bbackupd intercept timer tests a little less strict, because object IDs can vary depending on the order that readdir() returns files in. (refs #3) Modified: box/chris/merge/test/bbackupd/testbbackupd.cpp =================================================================== --- box/chris/merge/test/bbackupd/testbbackupd.cpp 2007-06-30 13:32:53 UTC (rev 1712) +++ box/chris/merge/test/bbackupd/testbbackupd.cpp 2007-06-30 14:17:17 UTC (rev 1713) @@ -841,7 +841,8 @@ { std::string line; TEST_THAT(reader.GetLine(line)); - TEST_THAT(line == "Receive Success(0xe)"); + std::string comp = "Receive Success(0x"; + TEST_THAT(line.substr(0, comp.size()) == comp); TEST_THAT(reader.GetLine(line)); TEST_THAT(line == "Receiving stream, size 124"); TEST_THAT(reader.GetLine(line)); @@ -850,9 +851,9 @@ TEST_THAT(line == "Receive IsAlive()"); TEST_THAT(reader.GetLine(line)); - std::string comp = "Send StoreFile(0x3,"; + comp = "Send StoreFile(0x3,"; TEST_THAT(line.substr(0, comp.size()) == comp); - comp = ",0xe,\"f1\")"; + comp = ",\"f1\")"; TEST_THAT(line.substr(line.size() - comp.size()) == comp); } @@ -892,7 +893,8 @@ { std::string line; TEST_THAT(reader.GetLine(line)); - TEST_THAT(line == "Receive Success(0xf)"); + std::string comp = "Receive Success(0x"; + TEST_THAT(line.substr(0, comp.size()) == comp); TEST_THAT(reader.GetLine(line)); TEST_THAT(line == "Receiving stream, size 124"); @@ -902,7 +904,7 @@ // so there will be no keepalives. TEST_THAT(reader.GetLine(line)); - std::string comp = "Send StoreFile(0x3,"; + comp = "Send StoreFile(0x3,"; TEST_THAT(line.substr(0, comp.size()) == comp); comp = ",0x0,\"f1\")"; TEST_THAT(line.substr(line.size() - comp.size()) @@ -944,7 +946,8 @@ { std::string line; TEST_THAT(reader.GetLine(line)); - TEST_THAT(line == "Receive Success(0x10)"); + std::string comp = "Receive Success(0x"; + TEST_THAT(line.substr(0, comp.size()) == comp); TEST_THAT(reader.GetLine(line)); TEST_THAT(line == "Receiving stream, size 124"); @@ -964,7 +967,7 @@ TEST_THAT(line == "Receive IsAlive()"); TEST_THAT(reader.GetLine(line)); - std::string comp = "Send StoreFile(0x3,"; + comp = "Send StoreFile(0x3,"; TEST_THAT(line.substr(0, comp.size()) == comp); comp = ",0x0,\"f1\")"; TEST_THAT(line.substr(line.size() - comp.size()) From boxbackup-dev at fluffy.co.uk Sat Jun 30 18:06:25 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Sat, 30 Jun 2007 17:06:25 -0000 Subject: [Box Backup-commit] #31: bbstoreaccounts info prints out wrong info? Message-ID: <051.ae42a47d4635057021565470cc36a312@fluffy.co.uk> #31: bbstoreaccounts info prints out wrong info? -------------------+-------------------------------------------------------- Reporter: petej | Type: defect Status: new | Priority: trivial Milestone: | Component: bbstoreaccounts Version: 0.10 | Keywords: -------------------+-------------------------------------------------------- When using bbstoreaccounts setlimits, it reported that it could not change the limits, but apparently in fact actually did. {{{ petjal at brick:~$ sudo /usr/local/bin/bbstoreaccounts info 00000014 Password: Account ID: 00000014 Last object ID: 111760 Blocks used: 2612322 (10204.38Mb) Blocks used by old files: 783071 (3058.87Mb) Blocks used by deleted files: 568686 (2221.43Mb) Blocks used by directories: 6511 (25.43Mb) Block soft limit: 2621440 (10240.00Mb) Block hard limit: 5242880 (20480.00Mb) Client store marker: 1183181003109375 petjal at brick:~$ sudo /usr/local/bin/bbstoreaccounts setlimit 00000014 20G 40G Couldn't lock the account -- did not change the limits Try again later. Limits on account 0x00000014 changed to 5242880 soft, 10485760 hard petjal at brick:~$ sudo /usr/local/bin/bbstoreaccounts info 00000014 Account ID: 00000014 Last object ID: 111760 Blocks used: 2612322 (10204.38Mb) Blocks used by old files: 783071 (3058.87Mb) Blocks used by deleted files: 568686 (2221.43Mb) Blocks used by directories: 6511 (25.43Mb) Block soft limit: 5242880 (20480.00Mb) Block hard limit: 10485760 (40960.00Mb) Client store marker: 1183181003109375 petjal at brick:~$ }}} -- Ticket URL: Box Backup An open source, completely automatic on-line backup system for UNIX. From boxbackup-dev at fluffy.co.uk Sat Jun 30 18:12:10 2007 From: boxbackup-dev at fluffy.co.uk (boxbackup-dev at fluffy.co.uk) Date: Sat, 30 Jun 2007 17:12:10 -0000 Subject: [Box Backup-commit] #32: Windows client 1692 emits double version info Message-ID: <051.e8fa25b890179290c7cf97977b178f13@fluffy.co.uk> #32: Windows client 1692 emits double version info -------------------+-------------------------------------------------------- Reporter: petej | Type: defect Status: new | Priority: trivial Milestone: | Component: bbackupquery Version: 0.10 | Keywords: -------------------+-------------------------------------------------------- (While testing volume shadow copy of an Exchange Server on Windows Server 2003...) {{{ D:\Program Files\Box Backup>bbackupquery "list -odst Exchange/mdbdata" quit Box Backup Query Tool vchris_general_1692, (c) Ben Summers and contributors 2003-2007 Box Backup Query Tool vchris_general_1692, (c) Ben Summers and contributors 2003-2007 Using configuration file D:\Program Files\Box Backup\bbackupd.conf No random device -- additional seeding of random number generator not performed. Connecting to store... Handshake with store... Login to store... Login complete. Type "help" for a list of commands. 0001b4a9 f----- 2007-06-19T08:32:04 194673 priv1.edb Logging off... Session finished. D:\Program Files\Box Backup> }}} -- Ticket URL: Box Backup An open source, completely automatic on-line backup system for UNIX.