[SCM] Samba Shared Repository - branch master updated
Martin Schwenke
martins at samba.org
Sat Jun 11 08:24:03 UTC 2016
The branch, master has been updated
via c598426 ctdb: use properly configured ctdb in debug-hung-script.sh
via 80492a4 ctdb: use properly configured ctdb in statd-callout
via d9a44ae ctdb: use properly configured ctdb in 99.timeout
via 0b98c64 ctdb: use properly configured ctdb in 91.lvs
via 54cd189 ctdb: use properly configured ctdb in 70.iscsi
via 5dea37a ctdb: use properly configured ctdb in 10.interfaces
via 7805374 ctdb: use properly configured ctdb in 13.per_ip_routing
via c9da418 ctdb: use properly configured ctdb in 10.external
via d277e29 ctdb: use properly configured ctdb in 01.reclock
via 6d2d6a3 ctdb: use properly configured ctdb in 00.ctdb
via 09d8fe7 ctdb: use properly configured ctdb in ctdbd_wrapper
via c904cb0 ctdb: use properly configured ctdb in functions
via 22f4e8c ctdb: make sure scripts using $CTDB called by test find ctdb
via 1cc5f8f ctdb: set the path to 'ctdb' in 'functions' in CTDB
from 6ef0a64 s3-script: Install the findsmb script
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c59842610b0a0e0ae08a47d46dece6193fb369d3
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 8 12:32:04 2016 +0200
ctdb: use properly configured ctdb in debug-hung-script.sh
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
Autobuild-User(master): Martin Schwenke <martins at samba.org>
Autobuild-Date(master): Sat Jun 11 10:23:03 CEST 2016 on sn-devel-144
commit 80492a4f91227bae45b88178436822b6213caa0e
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 8 12:28:56 2016 +0200
ctdb: use properly configured ctdb in statd-callout
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit d9a44ae4bfea4df7840155567a6d69b243aebe82
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 8 13:05:03 2016 +0200
ctdb: use properly configured ctdb in 99.timeout
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 0b98c646464648ce41faf410dc9c1ca10108a33a
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 8 13:04:48 2016 +0200
ctdb: use properly configured ctdb in 91.lvs
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 54cd189de328ecf88cca37ae737dd4bc0c86efc9
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 8 12:44:28 2016 +0200
ctdb: use properly configured ctdb in 70.iscsi
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 5dea37abd0ee2cc7cc1323bf6513f22edbb6c010
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 8 12:37:00 2016 +0200
ctdb: use properly configured ctdb in 10.interfaces
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 7805374a091f94b92d52746dacf6f6a82a450159
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 8 13:23:07 2016 +0200
ctdb: use properly configured ctdb in 13.per_ip_routing
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit c9da418d7f9b162709646b668e1921bd075a05be
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 8 13:22:44 2016 +0200
ctdb: use properly configured ctdb in 10.external
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit d277e294de1d7ae6a82e117b2a051441c50aa782
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 8 13:22:24 2016 +0200
ctdb: use properly configured ctdb in 01.reclock
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 6d2d6a3786d4e09ea5de75a9b7c166d94d103a40
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 8 13:21:56 2016 +0200
ctdb: use properly configured ctdb in 00.ctdb
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 09d8fe729315759dbc33de56b4aefbb0a57821ad
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 7 07:44:53 2016 +0000
ctdb: use properly configured ctdb in ctdbd_wrapper
This makes ctdbd_wrapper usable in non-standard installs.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit c904cb0929ace45d8288bb4fd9b3f09398a0fb93
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 8 12:28:36 2016 +0200
ctdb: use properly configured ctdb in functions
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 22f4e8c3539407b55953a93225803c01adbe8720
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 9 13:55:29 2016 +0200
ctdb: make sure scripts using $CTDB called by test find ctdb
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
commit 1cc5f8f6168db2646a29c29d6438a5d81b5731fe
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 8 12:08:35 2016 +0200
ctdb: set the path to 'ctdb' in 'functions' in CTDB
Allow this to be overridden from the caller.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Martin Schwenke <martin at meltin.net>
-----------------------------------------------------------------------
Summary of changes:
ctdb/config/ctdbd_wrapper | 4 ++--
ctdb/config/debug-hung-script.sh | 2 +-
ctdb/config/events.d/00.ctdb | 4 ++--
ctdb/config/events.d/01.reclock | 2 +-
ctdb/config/events.d/10.external | 4 ++--
ctdb/config/events.d/10.interface | 8 ++++----
ctdb/config/events.d/13.per_ip_routing | 8 ++++----
ctdb/config/events.d/70.iscsi | 2 +-
ctdb/config/events.d/91.lvs | 2 +-
ctdb/config/events.d/99.timeout | 2 +-
ctdb/config/functions | 24 +++++++++++++-----------
ctdb/config/statd-callout | 14 +++++++-------
ctdb/tests/eventscripts/scripts/local.sh | 2 ++
ctdb/wscript | 5 +++--
14 files changed, 44 insertions(+), 39 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper
index b1f71c3..b6b983c 100755
--- a/ctdb/config/ctdbd_wrapper
+++ b/ctdb/config/ctdbd_wrapper
@@ -256,7 +256,7 @@ start()
return 1
fi
- if ctdb runstate first_recovery startup running >/dev/null 2>&1 ; then
+ if $CTDB runstate first_recovery startup running >/dev/null 2>&1 ; then
return 0
fi
fi
@@ -278,7 +278,7 @@ stop()
return 0
fi
- ctdb shutdown
+ $CTDB shutdown
# Wait for remaining CTDB processes to exit...
_timeout=${CTDB_SHUTDOWN_TIMEOUT:-30}
diff --git a/ctdb/config/debug-hung-script.sh b/ctdb/config/debug-hung-script.sh
index 9bde684..cef004b 100755
--- a/ctdb/config/debug-hung-script.sh
+++ b/ctdb/config/debug-hung-script.sh
@@ -47,7 +47,7 @@ fi
if [ "$2" != "init" ] ; then
echo "---- ctdb scriptstatus ${2}: ----"
- ctdb scriptstatus "$2"
+ $CTDB scriptstatus "$2"
fi
echo "===== End of hung script debug for PID=\"$1\", event=\"$2\" ====="
diff --git a/ctdb/config/events.d/00.ctdb b/ctdb/config/events.d/00.ctdb
index 3bc20d7..bb150ac 100755
--- a/ctdb/config/events.d/00.ctdb
+++ b/ctdb/config/events.d/00.ctdb
@@ -107,7 +107,7 @@ set_ctdb_variables ()
while read v; do
varname="${v#CTDB_SET_}"
value=$(eval echo "\$$v")
- if ctdb setvar $varname $value ; then
+ if $CTDB setvar $varname $value ; then
echo "Set $varname to $value"
else
echo "Invalid configuration: CTDB_SET_${varname}=${value}"
@@ -140,7 +140,7 @@ case "$1" in
;;
startup)
- ctdb attach ctdb.tdb persistent
+ $CTDB attach ctdb.tdb persistent
;;
*)
diff --git a/ctdb/config/events.d/01.reclock b/ctdb/config/events.d/01.reclock
index e2d4d12..da37cf8 100755
--- a/ctdb/config/events.d/01.reclock
+++ b/ctdb/config/events.d/01.reclock
@@ -41,7 +41,7 @@ case "$1" in
echo "Reclock file \"$CTDB_RECOVERY_LOCK\" can not be accessed. Shutting down."
df
sleep 1
- ctdb shutdown
+ $CTDB shutdown
fi
ctdb_check_counter "error" -gt 3
diff --git a/ctdb/config/events.d/10.external b/ctdb/config/events.d/10.external
index 3fcb0e1..40f4680 100644
--- a/ctdb/config/events.d/10.external
+++ b/ctdb/config/events.d/10.external
@@ -28,12 +28,12 @@ takeover_assigned_ips ()
{
ctdb_get_pnn
- ctdb -X ip |
+ $CTDB -X ip |
awk -F'|' '{print $2}' |
while read ip ; do
if [ -n "$(ip_maskbits_iface $ip)" ] ; then
echo "Assigning $ip to this node ($pnn)"
- ctdb moveip "$ip" "$pnn"
+ $CTDB moveip "$ip" "$pnn"
fi
done
}
diff --git a/ctdb/config/events.d/10.interface b/ctdb/config/events.d/10.interface
index bdb9443..204f4c6 100755
--- a/ctdb/config/events.d/10.interface
+++ b/ctdb/config/events.d/10.interface
@@ -33,7 +33,7 @@ get_all_interfaces ()
# Get the interfaces for which CTDB has public IPs configured.
# That is, for all but the 1st line, get the 1st field.
- ctdb_ifaces=$(ctdb -X ifaces | sed -e '1d' -e 's@^|@@' -e 's@|.*@@')
+ ctdb_ifaces=$($CTDB -X ifaces | sed -e '1d' -e 's@^|@@' -e 's@|.*@@')
# Add $ctdb_interfaces and uniquify
all_interfaces=$(echo $all_interfaces $ctdb_ifaces | tr ' ' '\n' | sort -u)
@@ -52,10 +52,10 @@ monitor_interfaces()
for _iface in $all_interfaces ; do
if interface_monitor "$_iface" ; then
up_interfaces_found=true
- ctdb setifacelink "$_iface" up >/dev/null 2>&1
+ $CTDB setifacelink "$_iface" up >/dev/null 2>&1
else
down_interfaces_found=true
- ctdb setifacelink "$_iface" down >/dev/null 2>&1
+ $CTDB setifacelink "$_iface" down >/dev/null 2>&1
fi
done
@@ -233,7 +233,7 @@ case "$1" in
flush_route_cache
# propagate the new mac address
- ctdb gratiousarp $ip $niface
+ $CTDB gratiousarp $ip $niface
# tickle all existing connections, so that dropped packets
# are retransmited and the tcp streams work
diff --git a/ctdb/config/events.d/13.per_ip_routing b/ctdb/config/events.d/13.per_ip_routing
index 56dfc34..cfcd484 100755
--- a/ctdb/config/events.d/13.per_ip_routing
+++ b/ctdb/config/events.d/13.per_ip_routing
@@ -292,7 +292,7 @@ flush_rules_and_routes ()
# routes.
add_missing_routes ()
{
- ctdb ip -v -X | {
+ $CTDB ip -v -X | {
read _x # skip header line
# Read the rest of the lines. We're only interested in the
@@ -319,7 +319,7 @@ add_missing_routes ()
remove_bogus_routes ()
{
# Get a IPs current hosted by this node, each anchored with '@'.
- _ips=$(ctdb ip -v -X | awk -F'|' 'NR > 1 && $4 != "" {printf "@%s@\n", $2}')
+ _ips=$($CTDB ip -v -X | awk -F'|' 'NR > 1 && $4 != "" {printf "@%s@\n", $2}')
ip rule show |
while read _p _x _i _x _t ; do
@@ -382,7 +382,7 @@ case "$1" in
# flush our route cache
set_proc sys/net/ipv4/route/flush 1
- ctdb gratiousarp "$ip" "$iface"
+ $CTDB gratiousarp "$ip" "$iface"
;;
updateip)
@@ -397,7 +397,7 @@ case "$1" in
# flush our route cache
set_proc sys/net/ipv4/route/flush 1
- ctdb gratiousarp "$ip" "$niface"
+ $CTDB gratiousarp "$ip" "$niface"
tickle_tcp_connections "$ip"
;;
diff --git a/ctdb/config/events.d/70.iscsi b/ctdb/config/events.d/70.iscsi
index 33b71c4..9e75214 100755
--- a/ctdb/config/events.d/70.iscsi
+++ b/ctdb/config/events.d/70.iscsi
@@ -22,7 +22,7 @@ is_ctdb_managed_service || exit 0
case "$1" in
ipreallocated)
- all_ips=$(ctdb -X ip | tail -n +2)
+ all_ips=$($CTDB -X ip | tail -n +2)
# Block the iSCSI port. Only block for the address families
# we have configured. This copes with, for example, ip6tables
diff --git a/ctdb/config/events.d/91.lvs b/ctdb/config/events.d/91.lvs
index 141f964..434bd2b 100755
--- a/ctdb/config/events.d/91.lvs
+++ b/ctdb/config/events.d/91.lvs
@@ -109,7 +109,7 @@ ipreallocated)
ipvsadm -a -t "$CTDB_LVS_PUBLIC_IP" -r 127.0.0.1
ipvsadm -a -u "$CTDB_LVS_PUBLIC_IP" -r 127.0.0.1
- ctdb gratiousarp \
+ $CTDB gratiousarp \
"$CTDB_LVS_PUBLIC_IP" "$CTDB_LVS_PUBLIC_IFACE" >/dev/null 2>&1
flush_route_cache
diff --git a/ctdb/config/events.d/99.timeout b/ctdb/config/events.d/99.timeout
index 2a6495a..c18475f 100755
--- a/ctdb/config/events.d/99.timeout
+++ b/ctdb/config/events.d/99.timeout
@@ -14,7 +14,7 @@ loadconfig ctdb
case "$1" in
monitor)
- TIMEOUT=$(ctdb getvar EventScriptTimeout | awk '{print $3}')
+ TIMEOUT=$($CTDB getvar EventScriptTimeout | awk '{print $3}')
echo "sleeping for $((TIMEOUT * 2)) seconds..."
sleep $((TIMEOUT * 2))
;;
diff --git a/ctdb/config/functions b/ctdb/config/functions
index b2a0735..e32826d 100755
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -10,6 +10,8 @@ fi
CTDB_VARDIR="/usr/local/var/lib/ctdb"
ctdb_rundir="/usr/local/var/run/ctdb"
+CTDB="${CTDB:-/usr/local/bin/ctdb}"
+
# Only (and always) override these variables in test code
if [ -z "$CTDB_SCRIPT_VARDIR" ] ; then
@@ -243,7 +245,7 @@ ctdb_get_pnn ()
{
_pnn_file="${CTDB_SCRIPT_VARDIR}/my-pnn"
if [ ! -f "$_pnn_file" ] ; then
- ctdb pnn | sed -e 's at .*:@@' >"$_pnn_file"
+ $CTDB pnn | sed -e 's at .*:@@' >"$_pnn_file"
fi
read pnn <"$_pnn_file"
@@ -255,7 +257,7 @@ ctdb_get_ip_address ()
{
_ip_addr_file="${CTDB_SCRIPT_VARDIR}/my-ip-address"
if [ ! -f "$_ip_addr_file" ] ; then
- ctdb -X nodestatus |
+ $CTDB -X nodestatus |
awk -F '|' 'NR == 2 { print $3 }' >"$_ip_addr_file"
fi
@@ -378,7 +380,7 @@ ctdb_check_tcp_ports()
fi
for _p ; do # process each function argument (port)
- _cmd="ctdb checktcpport $_p"
+ _cmd="$CTDB checktcpport $_p"
_out=$($_cmd 2>&1)
_ret=$?
case "$_ret" in
@@ -400,7 +402,7 @@ ctdb_check_tcp_ports()
*)
echo "ERROR: unexpected error running \"ctdb checktcpport\""
debug <<EOF
-ctdb checktcpport (exited with $_ret) with output:
+$CTDB checktcpport (exited with $_ret) with output:
$_out"
EOF
return $_ret
@@ -518,9 +520,9 @@ tickle_tcp_connections ()
while read dest src; do
echo "Tickle TCP connection $src $dest"
- ctdb tickle $src $dest >/dev/null 2>&1 || _failed=true
+ $CTDB tickle $src $dest >/dev/null 2>&1 || _failed=true
echo "Tickle TCP connection $dest $src"
- ctdb tickle $dest $src >/dev/null 2>&1 || _failed=true
+ $CTDB tickle $dest $src >/dev/null 2>&1 || _failed=true
done
if $_failed ; then
@@ -909,7 +911,7 @@ ctdb_replay_monitor_status ()
{
echo "Replaying previous status for this script due to reconfigure..."
# Leading separator ('|') is missing in some versions...
- _out=$(ctdb scriptstatus -X | grep -E "^\|?monitor\|${script_name}\|")
+ _out=$($CTDB scriptstatus -X | grep -E "^\|?monitor\|${script_name}\|")
# Output looks like this:
# |monitor|60.nfs|1|ERROR|1314764004.030861|1314764004.035514|foo bar|
# This is the cheapest way of getting fields in the middle.
@@ -1241,7 +1243,7 @@ update_tickles ()
ctdb_get_pnn
# What public IPs do I hold?
- _ips=$(ctdb -X ip | awk -F'|' -v pnn=$pnn '$3 == pnn {print $2}')
+ _ips=$($CTDB -X ip | awk -F'|' -v pnn=$pnn '$3 == pnn {print $2}')
# IPs and port as ss filters
_ip_filter=""
@@ -1266,7 +1268,7 @@ update_tickles ()
# Record our current tickles in a temporary file
_my_tickles="${tickledir}/${_port}.tickles.$$"
for _i in $_ips ; do
- ctdb -X gettickles $_i $_port |
+ $CTDB -X gettickles $_i $_port |
awk -F'|' 'NR > 1 { printf "%s:%s %s:%s\n", $2, $3, $4, $5 }'
done |
sort >"$_my_tickles"
@@ -1274,13 +1276,13 @@ update_tickles ()
# Add tickles for connections that we haven't already got tickles for
comm -23 "$_my_connections" "$_my_tickles" |
while read _src _dst ; do
- ctdb addtickle $_src $_dst
+ $CTDB addtickle $_src $_dst
done
# Remove tickles for connections that are no longer there
comm -13 "$_my_connections" "$_my_tickles" |
while read _src _dst ; do
- ctdb deltickle $_src $_dst
+ $CTDB deltickle $_src $_dst
done
rm -f "$_my_connections" "$_my_tickles"
diff --git a/ctdb/config/statd-callout b/ctdb/config/statd-callout
index a923d8a..1cbe653 100755
--- a/ctdb/config/statd-callout
+++ b/ctdb/config/statd-callout
@@ -49,7 +49,7 @@ case "$1" in
cip="$2"
ctdb_get_pnn
date=$(date '+%s')
- ctdb ip -X |
+ $CTDB ip -X |
tail -n +2 |
while IFS="|" read x sip node x ; do
[ "$node" = "$pnn" ] || continue # not us
@@ -63,7 +63,7 @@ case "$1" in
# so we must add it to all the IPs that we serve
cip="$2"
ctdb_get_pnn
- ctdb ip -X |
+ $CTDB ip -X |
tail -n +2 |
while IFS="|" read x sip node x ; do
[ "$node" = "$pnn" ] || continue # not us
@@ -81,12 +81,12 @@ case "$1" in
# Filter out lines for any IP addresses that are not currently
# hosted public IP addresses.
ctdb_get_pnn
- ctdb_ips=$(ctdb ip | tail -n +2)
+ ctdb_ips=$($CTDB ip | tail -n +2)
sed_expr=$(echo "$ctdb_ips" |
awk -v pnn=$pnn 'pnn == $2 { \
ip = $1; gsub(/\./, "\\.", ip); \
printf "/statd-state@%s@/p\n", ip }')
- if cat $files | sed -n "$sed_expr" | ctdb ptrans "ctdb.tdb" ; then
+ if cat $files | sed -n "$sed_expr" | $CTDB ptrans "ctdb.tdb" ; then
rm $files
fi
;;
@@ -159,13 +159,13 @@ case "$1" in
# Construct a sed expression to take catdb output and produce pairs of:
# server-IP client-IP
# but only for the server-IPs that are hosted on this node.
- ctdb_all_ips=$(ctdb ip all | tail -n +2)
+ ctdb_all_ips=$($CTDB ip all | tail -n +2)
sed_expr=$(echo "$ctdb_all_ips" |
awk -v pnn=$pnn 'pnn == $2 { \
ip = $1; gsub(/\./, "\\.", ip); \
printf "s/^key.*=.*statd-state@\\(%s\\)@\\([^\"]*\\).*/\\1 \\2/p\n", ip }')
- statd_state=$(ctdb catdb ctdb.tdb | sed -n "$sed_expr" | sort)
+ statd_state=$($CTDB catdb ctdb.tdb | sed -n "$sed_expr" | sort)
[ -n "$statd_state" ] || exit 0
smnotify="${CTDB_HELPER_BINDIR}/smnotify"
@@ -195,7 +195,7 @@ case "$1" in
"$smnotify" --client=$cip --ip=$sip --server=$NFS_HOSTNAME --stateval=$stateval
done
- echo "$items" | ctdb ptrans "ctdb.tdb"
+ echo "$items" | $CTDB ptrans "ctdb.tdb"
}
# Remove any stale touch files (i.e. for IPs not currently
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index 51f3858..37141c6 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -20,6 +20,8 @@ export EVENTSCRIPTS_PATH
PATH="${EVENTSCRIPTS_PATH}:${PATH}"
+export CTDB="ctdb"
+
export EVENTSCRIPTS_TESTS_VAR_DIR="${TEST_VAR_DIR}/unit_eventscripts"
if [ -d "$EVENTSCRIPTS_TESTS_VAR_DIR" -a \
"$EVENTSCRIPTS_TESTS_VAR_DIR" != "/unit_eventscripts" ] ; then
diff --git a/ctdb/wscript b/ctdb/wscript
index 6a411da..60ea824 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -515,9 +515,10 @@ def build(bld):
sed_expr4 = 's|/usr/local/var/run/ctdb|%s|g' % (bld.env.CTDB_RUNDIR)
sed_expr5 = 's|/usr/local/sbin|%s|g' % (bld.env.SBINDIR)
sed_expr6 = 's|/usr/local/libexec/ctdb|%s|g' % (bld.env.CTDB_HELPER_BINDIR)
- sed_cmdline = '-e "%s" -e "%s" -e "%s" -e "%s" -e "%s" -e "%s"' % \
+ sed_expr7 = 's|/usr/local/bin|%s|g' % (bld.env.BINDIR)
+ sed_cmdline = '-e "%s" -e "%s" -e "%s" -e "%s" -e "%s" -e "%s" -e "%s"' % \
(sed_expr1, sed_expr2, sed_expr3, sed_expr4, sed_expr5,
- sed_expr6)
+ sed_expr6, sed_expr7)
for f in manpages:
x = '%s.xml' % (f)
--
Samba Shared Repository
More information about the samba-cvs
mailing list