The branch, master has been updated
via 877e0ef s4/upgradeprovision: Fix help for --debugguess.
via 249ba1e s4/upgradeprovision: Typo and better word.
via 7db5c10 s4: samba_backup: Fix typos.
from 60df3c0 s3: Make "net sam list [users|workstations]" list only the
right things
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 877e0ef5f27f90b784fd1f9a384f3eb6eeac5703
Author: Michael Wood <esiot...@gmail.com>
Date: Sat Jan 8 15:09:57 2011 +0200
s4/upgradeprovision: Fix help for --debugguess.
Signed-off-by: Matthieu Patou <m...@matws.net>
Autobuild-User: Matthieu Patou <m...@samba.org>
Autobuild-Date: Sun Feb 13 16:38:13 CET 2011 on sn-devel-104
commit 249ba1ed111e05a92d1124887fdd53ccba65d50e
Author: Michael Wood <esiot...@gmail.com>
Date: Sat Jan 8 15:08:47 2011 +0200
s4/upgradeprovision: Typo and better word.
Signed-off-by: Matthieu Patou <m...@matws.net>
commit 7db5c10f1a87b58c750f51d0d2d20264f1049dc9
Author: Michael Wood <esiot...@gmail.com>
Date: Fri Jan 7 13:51:48 2011 +0200
s4: samba_backup: Fix typos.
Signed-off-by: Matthieu Patou <m...@matws.net>
-----------------------------------------------------------------------
Summary of changes:
source4/scripting/bin/samba_backup | 6 +++---
source4/scripting/bin/upgradeprovision | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/bin/samba_backup
b/source4/scripting/bin/samba_backup
index fabf60c..5612578 100755
--- a/source4/scripting/bin/samba_backup
+++ b/source4/scripting/bin/samba_backup
@@ -39,8 +39,8 @@ for d in $DIRS;do
relativedirname=`find . -type d -name "$d" -prune`
n=`echo $d | sed 's/\//_/g'`
if [ "$d" = "private" ]; then
- find $refativedirname -name "*.ldb.bak" -exec rm {} \;
- for ldb in `find $refativedirname -name "*.ldb"`; do
+ find $relativedirname -name "*.ldb.bak" -exec rm {} \;
+ for ldb in `find $relativedirname -name "*.ldb"`; do
tdbbackup $ldb
if [ $? -ne 0 ]; then
echo "Error while backuping $ldb"
@@ -52,7 +52,7 @@ for d in $DIRS;do
echo "Error while archiving
${WHERE}/samba4_${n}.${WHEN}.tar.bz2"
exit 1
fi
- find $refativedirname -name "*.ldb.bak" -exec rm {} \;
+ find $relativedirname -name "*.ldb.bak" -exec rm {} \;
else
tar cjf ${WHERE}/${n}.${WHEN}.tar.bz2 $relativedirname
>/dev/null 2>&1
if [ $? -ne 0 ]; then
diff --git a/source4/scripting/bin/upgradeprovision
b/source4/scripting/bin/upgradeprovision
index 5b09ce6..8c79917 100755
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -142,7 +142,7 @@ parser.add_option("--setupdir", type="string",
metavar="DIR",
help="directory with setup files")
parser.add_option("--debugprovision", help="Debug provision",
action="store_true")
parser.add_option("--debugguess", action="store_true",
- help="Print information on what is different but won't be
changed")
+ help="Print information on which values are guessed")
parser.add_option("--debugchange", action="store_true",
help="Print information on what is different but won't be
changed")
parser.add_option("--debugchangesd", action="store_true",
@@ -265,7 +265,7 @@ def sanitychecks(samdb, names):
elif len(res) != 1:
print "Found %d domain controllers. For the moment " \
"upgradeprovision is not able to handle an upgrade on a " \
- "domain with more than one DC. PLease demote the other " \
+ "domain with more than one DC. Please demote the other " \
"DC(s) before upgrading" % len(res)
return False
else:
@@ -1821,7 +1821,7 @@ if __name__ == '__main__':
shutil.rmtree(provisiondir)
except StandardError, err:
- message(ERROR, "A problem occurred when trying to upgrade your "
+ message(ERROR, "A problem occurred while trying to upgrade your "
"provision. A full backup is located at %s" % backupdir)
if opts.debugall or opts.debugchange:
(typ, val, tb) = sys.exc_info()
--
Samba Shared Repository
