[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bacula-commits
Subject:    [Bacula-commits] [bacula.org] Bacula Community source branch
From:       git () bacula ! org
Date:       2011-07-06 12:22:44
Message-ID: 20110706122245.12EA339B5FC () bacula ! bacula ! org
[Download RAW message or body]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Bacula Community source".

The branch, Branch-5.1 has been updated
       via  6ef39973b93383f8007c61ef5ad9b035787b0a55 (commit)
       via  8e3289ccaa380e20a67f914fca3b839f8b3d104a (commit)
       via  c7d8148e71566d467994a3db586f695378f03b91 (commit)
      from  0f9293bcca2250ec509e122dc6f40e55bbd3cff2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6ef39973b93383f8007c61ef5ad9b035787b0a55
Author: Eric Bollengier <eric@eb.homelinux.org>
Date:   Wed Jul 6 14:19:59 2011 +0200

    Fix #1602 about Uninstall /S that should not prompt for user interaction

commit 8e3289ccaa380e20a67f914fca3b839f8b3d104a
Author: Eric Bollengier <eric@eb.homelinux.org>
Date:   Tue Jul 5 19:07:05 2011 +0200

    Change JobFiles display from %f to %F in RunScript because %f was already \
affected to Fileset name

commit c7d8148e71566d467994a3db586f695378f03b91
Author: Marco van Wieringen <mvw@planets.elm.net>
Date:   Sat Jul 2 22:59:03 2011 +0200

    Remove last traces of AFS detection.

-----------------------------------------------------------------------

Summary of changes:
diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 5c6f982..213e71e 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -2544,18 +2544,7 @@ if test x$support_acl = xyes -o x$support_acl = xauto; then
       AC_CHECK_LIB(acl, acl_get_file,
 	 [
 	     have_acl=yes
-	     if test x$have_afs = xyes; then
-		dnl
-		dnl Because of possible naming conflict with AFS libacl make sure we use the one \
                in /usr/lib64 or /usr/lib !!!
-		dnl
-		if test -d /usr/lib64/; then
-		   FDLIBS="-L/usr/lib64 -lacl $FDLIBS"
-		else
-		   FDLIBS="-L/usr/lib -lacl $FDLIBS"
-		fi
-	     else
-		FDLIBS="-lacl $FDLIBS"
-	     fi
+	     FDLIBS="-lacl $FDLIBS"
 	 ]
       )
    fi
@@ -3492,7 +3481,6 @@ Configuration on `date`:
    build-dird:		    ${build_dird}
    build-stored:	    ${build_stored}
    Plugin support:	    ${have_plugins}
-   AFS support: 	    ${have_afs}
    ACL support: 	    ${have_acl}
    XATTR support:	    ${have_xattr}
    Python support:	    ${support_python} ${PYTHON_LIBS}
diff --git a/bacula/src/lib/util.c b/bacula/src/lib/util.c
index cd24445..0f9b985 100644
--- a/bacula/src/lib/util.c
+++ b/bacula/src/lib/util.c
@@ -723,7 +723,7 @@ void decode_session_key(char *decode, char *session, char *key, \
                int maxlen)
  *  %r = Recipients
  *  %v = Volume name
  *  %b = Job Bytes
- *  %f = Job Files
+ *  %F = Job Files
  *
  *  omsg = edited output message
  *  imsg = input string containing edit codes (%x)
@@ -809,7 +809,7 @@ POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, const \
char *to, job_co  str = _("*none*");
             }
             break;
-         case 'f':                    /* Job Files */
+         case 'F':                    /* Job Files */
             str = edit_uint64(jcr->JobFiles, add);
             break;
          case 'b':                    /* Job Bytes */
diff --git a/bacula/src/win32/win32_installer/winbacula.nsi \
b/bacula/src/win32/win32_installer/winbacula.nsi index 941295e..16bdc8b 100644
--- a/bacula/src/win32/win32_installer/winbacula.nsi
+++ b/bacula/src/win32/win32_installer/winbacula.nsi
@@ -677,8 +677,11 @@ Section "Uninstall"
   Delete /REBOOTOK "$INSTDIR\help\*"
 
   ; Check for existing installation
-  MessageBox MB_YESNO|MB_ICONQUESTION \
-  "Would you like to delete the current configuration files and the working state \
file?" IDNO NoDel +  IfSilent +2
+    MessageBox MB_YESNO|MB_ICONQUESTION \
+    "Would you like to delete the current configuration files and the working state \
file?" IDNO NoDel +
+
     Delete /REBOOTOK "$INSTDIR\*"
     Delete /REBOOTOK "$INSTDIR\working\*"
     Delete /REBOOTOK "$INSTDIR\plugins\*"


hooks/post-receive
-- 
Bacula Community source

------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security 
threats, fraudulent activity, and more. Splunk takes this data and makes 
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Bacula-commits mailing list
Bacula-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bacula-commits


[prev in list] [next in list] [prev in thread] [next in thread]