Author: wade
Date: 2006-07-05 13:19:23 -0400 (Wed, 05 Jul 2006)
New Revision: 62273
Modified:
trunk/release/monobuild/tarball-builder-daemon.py
trunk/release/pyutils/packaging.py
trunk/release/pyutils/src_repo_utils.py
Log:
tarball-builder-daemon.py / src_repo_utils.py:
-oops, catch another ssh/network error
packaging.py:
-print warning if no shell code is found when building a def in the zip build
system
Modified: trunk/release/monobuild/tarball-builder-daemon.py
===================================================================
--- trunk/release/monobuild/tarball-builder-daemon.py 2006-07-05 16:35:10 UTC
(rev 62272)
+++ trunk/release/monobuild/tarball-builder-daemon.py 2006-07-05 17:19:23 UTC
(rev 62273)
@@ -81,6 +81,11 @@
for i in range(starting_rev, latest_tree_rev +
1):
latest_for_package =
self.src_repo.latest_path_revision(pack_obj.info['HEAD_PATH'], revision=i)
+ if not latest_for_package:
+ log.log("Error getting revision
%d, trying later... (%s)\n" % (i, pack_name) )
+ # Skip to next pack...
+ break
+
if not self.distfiles.contains('HEAD',
pack_name, str(latest_for_package)) and not sigint_event.isSet():
command = "cd %s; ./mktarball
%s snap %d" % (config.packaging_dir, pack_name, latest_for_package)
log.log("Executing: %s\n" %
(command) )
Modified: trunk/release/pyutils/packaging.py
===================================================================
--- trunk/release/pyutils/packaging.py 2006-07-05 16:35:10 UTC (rev 62272)
+++ trunk/release/pyutils/packaging.py 2006-07-05 17:19:23 UTC (rev 62273)
@@ -503,11 +503,15 @@
my_os_version = my_os + "-" + self.package_env.info['version']
my_distro = self.package_env.info['distro']
+ shell_code = ""
for key in [my_os, my_os_version, my_distro]:
new_key = key.replace("-", "_") + "_ZIP_BUILD"
shell_code = self.get_info_var(new_key)
if shell_code: break
+ if not shell_code:
+ print "Warning... could not find shell code..."
+
return shell_code
def get_info_var(self, key):
Modified: trunk/release/pyutils/src_repo_utils.py
===================================================================
--- trunk/release/pyutils/src_repo_utils.py 2006-07-05 16:35:10 UTC (rev
62272)
+++ trunk/release/pyutils/src_repo_utils.py 2006-07-05 17:19:23 UTC (rev
62273)
@@ -58,7 +58,13 @@
for line in output.split('\n'):
list = line.split()
- version = int(list[0])
+
+ # Catch network/ssh errors
+ try:
+ version = int(list[0])
+ except:
+ return 0
+
tmp_module = os.path.dirname(list.pop())
if tmp_module == module:
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
