[Libreoffice-commits] .: 2 commits - configure.ac g

[Libreoffice Gerrit user]

 configure.ac |    4 ++--
 g            |    5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit e1b59fc0c4124457d4a1d29c6c4cc222ef665518
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Nov 23 20:58:27 2012 +0100

    Fix --set-push-urls.
    
    Change-Id: Ic3a424b5ac8c2168747bc7253f421bf5367beac7

diff --git a/g b/g
index 0ca04dd..288489c 100755
--- a/g
+++ b/g
@@ -93,9 +93,6 @@ local repo
 set_push_urls()
 {
     PUSH_USER="$1"
-    if [ -n "$PUSH_USER" ] ; then
-	PUSH_USER="${PUSH_USER}@"
-    fi
     set_push_url
     for repo in ${SUBMODULES_ACTIVE?} ; do
 	set_push_url "${repo?}"
@@ -277,7 +274,7 @@ while [ "${COMMAND:0:1}" = "-" ] ; do
 	    if [ -n "${PUSH_USER}" ] ; then
 		PUSH_USER="${PUSH_USER}@"
 	    fi
-	    set_push_urls
+	    set_push_urls "$PUSH_USER"
 	    exit 0;
 	    ;;
 	-*)
commit 600e3597860105861086dfa8503759297ebe8c55
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Oct 22 18:53:49 2012 +0200

    Improve the error messages.
    
    Change-Id: I1c5e2440e0d3c520221cc19bf2d6152970e156c1

diff --git a/configure.ac b/configure.ac
index b8bff37..b9c4d16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7654,10 +7654,10 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
             WITH_KRB5=YES
             save_LIBS=$LIBS
             AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
-                [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])])
+                [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5, try installing libcom_err devel package])])
             LIBS=$save_LIBS
             AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
-                [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])])
+                [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5, try installing krb5 devel package])])
             LIBS=$save_LIBS
         fi
         if test "$with_gssapi" != "no"; then