Author: wade
Date: 2007-03-29 19:29:05 -0500 (Thu, 29 Mar 2007)
New Revision: 75177

Modified:
   trunk/release/monobuild/buildserver.py
   trunk/release/packaging/build
   trunk/release/pyutils/rpm_utils.py
   trunk/release/pyutils/utils.py
   trunk/release/utils/do-clean-semaphores
   trunk/release/website/mk-distro-index.py
   trunk/release/website/mk-repos.py
Log:
packaging/build:
-verify rpms and zips before considering the build a success

website/mk-repos.py:
website/mk-distro-index.py:
pyutils/utils.py:
pyutils/rpm_utils.py:
-refactory rpm_query


utils/do-clean-semaphores:
-print how many sems cleaned up



Modified: trunk/release/monobuild/buildserver.py
===================================================================
--- trunk/release/monobuild/buildserver.py      2007-03-29 21:22:09 UTC (rev 
75176)
+++ trunk/release/monobuild/buildserver.py      2007-03-30 00:29:05 UTC (rev 
75177)
@@ -288,6 +288,7 @@
        def cancelled(self):
                # Don't shut this thread down until the tarball and build 
threads are done
                #  Are these vars available across threads?  (if not, we'll 
have to use a signal)
+               # TODO: Cafeful, this thread may not have been started yet
                if len(build_threads) == 0 and not tarball_thread.isAlive():
                        return True
                else:

Modified: trunk/release/packaging/build
===================================================================
--- trunk/release/packaging/build       2007-03-29 21:22:09 UTC (rev 75176)
+++ trunk/release/packaging/build       2007-03-30 00:29:05 UTC (rev 75177)
@@ -287,9 +287,8 @@
 build_env.env_vars['BUILD_OS'] = build_env.info['os']
 build_env.env_vars['BUILD_ARCH'] = build_env.info['arch']
 
-(code, output) = build_env.ssh.execute(build_command, env=build_env.env_vars, 
logger=log_obj, output_timeout=timeout, max_output_size=max_output_size)
-#code = 0
-if code:
+# Put in a function rather than copy and paste...
+def build_failed(build_env, code, LOGFILE, build_info, package):
        build_env.unlock_env()
        state = get_state(code)
        print "Build failed, see log in %s for details" % LOGFILE
@@ -299,9 +298,43 @@
        build_info.update_build(state="failure", finish=utils.get_time())
        sys.exit(7)
 
+(code, output) = build_env.ssh.execute(build_command, env=build_env.env_vars, 
logger=log_obj, output_timeout=timeout, max_output_size=max_output_size)
+if code:
+       build_failed(build_env, code, LOGFILE, build_info, package)
+
 distutils.dir_util.mkpath(package_version_path)
 build_env.ssh.copy_from(['%s/builder/built-packages/*' % build_location, 
'%s/scratch/*.spec' % build_location], package_version_path)
 
+# Make sure packages got here ok
+log_obj.log("Verifying packages...\n")
+
+if build_env.get_info_var('USE_ZIP_PKG'):
+       files = glob.glob(package_version_path + os.sep + "*.zip")
+       code = 0
+       output = ""
+       for file in files:
+               (tmp_code, tmp_output) = utils.launch_process("unzip -qt " + 
file, logger=log_obj)
+               if tmp_code: code = 1
+               output += tmp_output
+else:
+       files = glob.glob(package_version_path + os.sep + "*.rpm")
+       (code, output) = utils.launch_process("rpm -K " + " ".join(files), 
logger=log_obj)
+
+if code:
+       log_obj.log(output + "\n")
+       log_obj.log("Verifying packages failed... (usually because of lack of 
disk space or incomplete copy)\n")
+
+       # Seems sometimes rmtree doesn't full work...
+       try:
+               log_obj.log("Removing build...\n")
+               shutil.rmtree(package_version_path)
+       except:
+               log_obj.log("Error removing build... (possibly a bug in 
python's shutil.rmtree)\n")
+               print "Error removing build... (bug in python)"
+       build_failed(build_env, code, LOGFILE, build_info, package)
+
+log_obj.log("Packages verified!\n")
+
 # Create link to packages
 try:
        os.symlink(os.path.join("../../../../../../../../packaging/", 
package.package_base_relpath,  package.package_relpath,  ver_path), 
os.path.join(config.build_info_dir, build_info.rel_files_dir, 'files', 
'downloads' ) )

Modified: trunk/release/pyutils/rpm_utils.py
===================================================================
--- trunk/release/pyutils/rpm_utils.py  2007-03-29 21:22:09 UTC (rev 75176)
+++ trunk/release/pyutils/rpm_utils.py  2007-03-30 00:29:05 UTC (rev 75177)
@@ -5,6 +5,8 @@
 
 child_rpm_match = re.compile("is needed by \(installed\) (\S+)")
 
+rpm_query_cache = {}
+
 def rpm_is_installed(rpm_name):
 
        (status, output) = commands.getstatusoutput("rpm -q " + rpm_name)
@@ -60,4 +62,48 @@
 
        return installed_rpms
 
+def rpm_query(query_format, file, installed=False):
+        """Args: query_format, file.
+        query_format can be a list or a string.
+        Returns: results of query, which can also be a list (if > 1), or a 
string (if < 2).
 
+        Ex:  name = rpm_utils.rpm_query('NAME', 'myrpm.rpm')
+        Ex:  (name, sum) = rpm_utils.rpm_query(['NAME', 'SUMMARY'], 
'myrpm.rpm')
+
+        This function also utilizes a hash cache to speed up the script 
generation by a couple of minutes."""
+
+        marker = "__MONO__"
+
+        if installed:
+                installed = ""
+        else:
+                installed = "p"
+
+        # Find if query is a string or list
+        if query_format.__class__ == str:
+                query_format = [ query_format ]
+
+        # Build up query string
+        for i in range(0, len(query_format)):
+                query_format[i] = "%{" + query_format[i] + "}"
+
+        query_string = marker.join(query_format)
+
+        #print "query: " + query_string
+        #print "querying %s for %s" % (file, query_string)
+
+        key = os.path.basename(file) + ":" + query_string
+
+        if rpm_query_cache.has_key(key):
+                #print "Cache hit!"
+                output = rpm_query_cache[key]
+        else:   
+                (code, output) = commands.getstatusoutput("rpm -q%s 
--queryformat \"%s\" %s" % (installed, query_string, file))
+                rpm_query_cache[key] = output
+
+        results = output.split(marker)
+        if len(results) <= 1:
+                results = output
+
+        return results
+

Modified: trunk/release/pyutils/utils.py
===================================================================
--- trunk/release/pyutils/utils.py      2007-03-29 21:22:09 UTC (rev 75176)
+++ trunk/release/pyutils/utils.py      2007-03-30 00:29:05 UTC (rev 75177)
@@ -50,8 +50,6 @@
 debug=0
 KILLED_EXIT_CODE=-42
 
-rpm_query_cache = {}
-
 match_all = re.compile('')
 
 # Get vars out of shell scripts (def files)
@@ -614,52 +612,6 @@
        return tz_string
 
 
-def rpm_query(query_format, file, installed=False):
-       """Args: query_format, file.
-       query_format can be a list or a string.
-       Returns: results of query, which can also be a list (if > 1), or a 
string (if < 2).
-
-       Ex:  name = utils.rpm_query('NAME', 'myrpm.rpm')
-       Ex:  (name, sum) = utils.rpm_query(['NAME', 'SUMMARY'], 'myrpm.rpm')
-
-       This function also utilizes a hash cache to speed up the script 
generation by a couple of minutes."""
-
-       marker = "__MONO__"
-
-       if installed: 
-               installed = ""
-       else:
-               installed = "p"
-
-       # Find if query is a string or list
-       if query_format.__class__ == str:
-               query_format = [ query_format ]
-
-       # Build up query string
-       for i in range(0, len(query_format)):
-               query_format[i] = "%{" + query_format[i] + "}"
-
-       query_string = marker.join(query_format)
-
-       #print "query: " + query_string
-       #print "querying %s for %s" % (file, query_string)
-
-       key = os.path.basename(file) + ":" + query_string
-
-       if rpm_query_cache.has_key(key):
-               #print "Cache hit!"
-               output = rpm_query_cache[key]
-       else:
-               code, output = launch_process("rpm -q%s --queryformat \"%s\" 
%s" % (installed, query_string, file), capture_stderr=0, print_output=0 )
-               rpm_query_cache[key] = output
-
-       results = output.split(marker)
-       if len(results) <= 1:
-               results = output
-
-       return results
-
-
 def send_mail(fr, to, subject, body):
 
        # Construct date string

Modified: trunk/release/utils/do-clean-semaphores
===================================================================
--- trunk/release/utils/do-clean-semaphores     2007-03-29 21:22:09 UTC (rev 
75176)
+++ trunk/release/utils/do-clean-semaphores     2007-03-30 00:29:05 UTC (rev 
75177)
@@ -9,9 +9,12 @@
 output = commands.getoutput('ipcs')
 reg = re.compile('(0x\S+)')
 
+count = 0
 for line in output.split('\n'):
        match = reg.search(line)
        if match:
                print match.group(1)
-               os.system('ipcrm -S %s' % match.group(1))
+               ret = os.system('ipcrm -S %s' % match.group(1))
+               if not ret: count += 1
 
+print "Remove %d semaphore(s)" % count

Modified: trunk/release/website/mk-distro-index.py
===================================================================
--- trunk/release/website/mk-distro-index.py    2007-03-29 21:22:09 UTC (rev 
75176)
+++ trunk/release/website/mk-distro-index.py    2007-03-30 00:29:05 UTC (rev 
75177)
@@ -15,6 +15,7 @@
 import packaging
 import config
 import utils
+import rpm_utils
 
 
 def get_rpm_install(env_obj, archive=False):
@@ -124,7 +125,7 @@
                        if re.compile("\.src\.rpm").search(i):
                                continue
 
-                       (NAME, DESC) = utils.rpm_query(['NAME', 'SUMMARY'], 
'../external_packages/%s/%s' % (env_obj.name, i) )
+                       (NAME, DESC) = rpm_utils.rpm_query(['NAME', 'SUMMARY'], 
'../external_packages/%s/%s' % (env_obj.name, i) )
                        return_text += "<li><a href='%s/%s/%s'>%s</a> -- 
%s</li>\n" % (external_url_path, env_obj.name, i, NAME, DESC)
                return_text += "</ul>\n"
 
@@ -135,7 +136,7 @@
 
                        i = os.path.basename(i)
 
-                       NAME = utils.rpm_query('NAME', 
'../external_packages/%s/%s' % (env_obj.name, i) )
+                       NAME = rpm_utils.rpm_query('NAME', 
'../external_packages/%s/%s' % (env_obj.name, i) )
                        return_text += "<a href='%s/%s/%s'>%s</a> \n" % 
(external_url_path, env_obj.name, i, NAME)
 
                return_text += "</p>\n"
@@ -238,7 +239,7 @@
                        arc_out.write("<ul>\n")
 
                        for i in RPMS:
-                               (NAME, DESC) = utils.rpm_query(['NAME', 
'SUMMARY'], i)
+                               (NAME, DESC) = rpm_utils.rpm_query(['NAME', 
'SUMMARY'], i)
                                out.write("<li><a href='../../%s/%s'>%s</a> -- 
%s</li>\n" % (package_src_url, i, NAME, DESC) )
                                arc_out.write("<li><a 
href='../../../../%s/%s'>%s</a> -- %s</li>\n" % (package_src_url, i, NAME, 
DESC) )
                        

Modified: trunk/release/website/mk-repos.py
===================================================================
--- trunk/release/website/mk-repos.py   2007-03-29 21:22:09 UTC (rev 75176)
+++ trunk/release/website/mk-repos.py   2007-03-30 00:29:05 UTC (rev 75177)
@@ -20,6 +20,7 @@
 import config
 import packaging
 import utils
+import rpm_utils
 
 # Command line options
 try:
@@ -94,7 +95,7 @@
 
                # Create hard links for all rpms
                for file in rpms:
-                       arch_dir = distro_obj.name + os.sep + 
utils.rpm_query('ARCH', file)
+                       arch_dir = distro_obj.name + os.sep + 
rpm_utils.rpm_query('ARCH', file)
                        if not os.path.exists(arch_dir):  
distutils.dir_util.mkpath(arch_dir)
 
                        # Hrm... seems the shutil.rmtree didn't work... ?

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to