On Fri, May 20, 2005 at 11:34:57AM +0200, José Luis Tallón wrote: > Please find attached the patch containing the differences between > bacula_1.36.2-2 and bacula_1.36.2-2sarge1. Thanks to the inestimable > collaboration of Roberto Lumbreras <rover@debian.org>, it is down to > 1310 lines. > This new version includes all upstream RC fixes and solves a number > of minor bugs and glitches with the packaging itself (so that we release > the best package possible). Additionally, it links against > libmysqlclient14 instead of libmysqlclient10, in order to avoid problems > with MySQL 4.1 servers. > Unfortunately, it stills carries the old documentation and support > for a deprecated config file syntax( i have kept those away as > instructed by Vorlon), which will undoubtly cause me a few headaches in > the future... it does support the new style config, however, so i expect > that most users will be already using the new one. Approved. > diff -Naurp bacula-1.36.2-2/src/findlib/create_file.c bacula-1.36.2-2sarge1/src/findlib/create_file.c > --- bacula-1.36.2-2/src/findlib/create_file.c 2004-07-27 21:00:33.000000000 +0000 > +++ bacula-1.36.2-2sarge1/src/findlib/create_file.c 2005-05-20 09:07:19.000000000 +0000 > @@ -271,6 +271,12 @@ int create_file(JCR *jcr, ATTR *attr, BF > if ((bopen(bfd, attr->ofname, O_WRONLY|O_BINARY, 0)) < 0) { > berrno be; > be.set_errno(bfd->berrno); > +#ifdef HAVE_WIN32 > + /* Check for trying to create a drive, if so, skip */ > + if (attr->ofname[1] == ':' && attr->ofname[2] == '/' && attr->ofname[3] == 0) { > + return CF_SKIP; > + } > +#endif > Jmsg2(jcr, M_ERROR, 0, _("Could not open %s: ERR=%s\n"), > attr->ofname, be.strerror()); > return CF_ERROR; Well, that seems rather unnecessary in a Debian upload, unless HAVE_WIN32 means something other than the obvious? Thanks, -- Steve Langasek postmodern programmer
Attachment:
signature.asc
Description: Digital signature