Author: wade
Date: 2007-09-26 15:59:52 -0400 (Wed, 26 Sep 2007)
New Revision: 86438
Modified:
trunk/release/jailbuilder/buildjail.py
trunk/release/jailbuilder/gatherrpms.py
trunk/release/packaging/defs/mono
trunk/release/packaging/do-msvn-tar
trunk/release/pyutils/remote_shell.py
Log:
Bugfixes found while setting up a new instance on Andrew's box...
defs/mono:
-use shell compatible code (Ubuntu has /bin/sh point to dash)
do-msvn-tar:
-turn off strict host checking when checking out from svn to build
tarball
jailbuilder/*:
-exit if there are errors
-obsolete iso method
-unfinished refactoring: regexes are in jail_config.py now
pyutils/remote_shell.py:
-more unfinished refactoring, fix make_path for local interface
Modified: trunk/release/jailbuilder/buildjail.py
===================================================================
--- trunk/release/jailbuilder/buildjail.py 2007-09-26 19:55:42 UTC (rev
86437)
+++ trunk/release/jailbuilder/buildjail.py 2007-09-26 19:59:52 UTC (rev
86438)
@@ -384,6 +384,8 @@
(status, output) = utils.launch_process(command)
print "Status: %d" % status
print "Output: " + output
+ if status:
+ sys.exit(1)
# Reinstall the rpms from inside the jail
# manifest files don't work on rpm 3 and below...
Modified: trunk/release/jailbuilder/gatherrpms.py
===================================================================
--- trunk/release/jailbuilder/gatherrpms.py 2007-09-26 19:55:42 UTC (rev
86437)
+++ trunk/release/jailbuilder/gatherrpms.py 2007-09-26 19:59:52 UTC (rev
86438)
@@ -41,7 +41,7 @@
# Name pattern matching
def is_an_rpm(string):
- if not ignoresource.search(string) and matchrpm.search(string):
+ if not jail_config.ignoresource.search(string) and
jail_config.matchrpm.search(string):
return 1
else:
return 0
@@ -331,6 +331,7 @@
if method == "iso":
print iso_notice
+ sys.exit(1)
fetch = get_from_cd
# Get everything from index 2 on
source = sys.argv[3:]
Modified: trunk/release/packaging/defs/mono
===================================================================
--- trunk/release/packaging/defs/mono 2007-09-26 19:55:42 UTC (rev 86437)
+++ trunk/release/packaging/defs/mono 2007-09-26 19:59:52 UTC (rev 86438)
@@ -293,12 +293,12 @@
get_destroot () {
# rh9 rpms can't be used on sles-8-i386
- if [ $DISTRO == "sles-8-i386" ] ; then
+ if test x$DISTRO = xsles-8-i386 ; then
DEST_ROOT=$DISTRO
- elif [ x$USE_ZIP_PKG != x ] ; then
+ elif test x$USE_ZIP_PKG != x ; then
DEST_ROOT=$DISTRO
else
- DEST_ROOT=$ARCH
+ DEST_ROOT=$DISTRO
fi
}
Modified: trunk/release/packaging/do-msvn-tar
===================================================================
--- trunk/release/packaging/do-msvn-tar 2007-09-26 19:55:42 UTC (rev 86437)
+++ trunk/release/packaging/do-msvn-tar 2007-09-26 19:59:52 UTC (rev 86438)
@@ -67,7 +67,7 @@
# use the key in /usr/share/ximian-build-system/conf/ssh
# This needs to be exported to the environment
-SVN_SSH = "ssh -i %s/distro_source_key" % temp_dir
+SVN_SSH = "ssh -i %s/distro_source_key -o StrictHostKeyChecking=no " % temp_dir
SVNEXPORT = "svn export -q " + rev_arg
MONO_ROOT = config.MONO_ROOT
SVN_PATHS = ":".join(svn_paths)
Modified: trunk/release/pyutils/remote_shell.py
===================================================================
--- trunk/release/pyutils/remote_shell.py 2007-09-26 19:55:42 UTC (rev
86437)
+++ trunk/release/pyutils/remote_shell.py 2007-09-26 19:59:52 UTC (rev
86438)
@@ -7,6 +7,7 @@
import re
import glob
import shutil
+import distutils.dir_util
import config
import utils
@@ -291,6 +292,6 @@
try:
distutils.dir_util.mkpath(dir)
os.chmod(dir, 0777)
- except:
+ except distutils.errors.DistutilsFileError:
error = 1
return error
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches