[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  e96f9a4... s4-install: old systems don't have sed -i
      from  d524082... s4-selftest: s4 passes all the SMB2-LOCK tests now

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e96f9a40ad46b8c08eaa81fde015dccc990388c5
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Nov 27 19:58:00 2009 +1100

    s4-install: old systems don't have sed -i
    
    surprisingly, this failure came from SLES8. I didn't realise that the
    -i option was so new!

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

Summary of changes:
 source4/script/installmisc.sh |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/script/installmisc.sh b/source4/script/installmisc.sh
index 7851d1f..cb61862 100755
--- a/source4/script/installmisc.sh
+++ b/source4/script/installmisc.sh
@@ -18,7 +18,10 @@ cd $SRCDIR || exit 1
 fix_python_path() {
     f="$1"
     egrep 'sys.path.insert.*bin/python' $f > /dev/null && {
-	sed -i "s|\(sys.path.insert.*\)bin/python\(.*\)$|\1$PYTHONDIR\2|g" $f || exit 1
+	# old systems don't have sed -i :-(
+	sed "s|\(sys.path.insert.*\)bin/python\(.*\)$|\1$PYTHONDIR\2|g" < $f > $f.$$ || exit 1
+	mv -f $f.$$ $f || exit 1
+	chmod +x $f
     }
 }
 


-- 
Samba Shared Repository