SF.net SVN: gar:[23271] csw/mgar/gar/v2/lib/python/package_stats.py

[wahwah at users.sourceforge.net]

Revision: 23271
          http://sourceforge.net/p/gar/code/23271
Author:   wahwah
Date:     2014-03-23 14:50:42 +0000 (Sun, 23 Mar 2014)
Log Message:
-----------
checkpkg: Better error message

This check can fire if you run sparc+intel builds in parallel and have
arch=all packages in your set. When that happens, checkpkg is first asked to
examine a file with content X, but later the same filename contains content B,
because mgar running on the other architecture overwrote it.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/package_stats.py

Modified: csw/mgar/gar/v2/lib/python/package_stats.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_stats.py	2014-03-23 14:21:08 UTC (rev 23270)
+++ csw/mgar/gar/v2/lib/python/package_stats.py	2014-03-23 14:50:42 UTC (rev 23271)
@@ -159,12 +159,17 @@
       try:
         data_back = cjson.decode(stdout)
         if data_back['md5_sum'] != catalog_entry['md5sum']:
-          msg = ('Unexpected file content: catalog said '
-                 'that %r would have MD5 sum %r but it '
-                 'turned out to be %r when read from allpkgs. '
+          msg = ('Unexpected file content: on disk (or in catalog) the file '
+                 '%r (%r) has MD5 sum %r but it turned out to be %r as '
+                 'seen by collect_pkg_metadata.py. '
                  'We cannot continue, because we have no '
-                 'access to the data we are asked to examine.'
+                 'access to the data we are asked to examine. '
+                 'This can happen when you run mgar on intel and sparc in '
+                 'parallel, and you have some arch=all packages in the '
+                 'package set. This error will not happen if you run '
+                 'mgar platforms.'
                  % (catalog_entry['file_basename'],
+                    catalog_entry['pkg_path'],
                     catalog_entry['md5sum'],
                     data_back['md5_sum']))
           raise PackageError(msg)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.