Revision: 23913
http://sourceforge.net/p/gar/code/23913
Author: wahwah
Date: 2014-08-03 11:04:47 +0000 (Sun, 03 Aug 2014)
Log Message:
-----------
checkpkg: A dependency might not exist.
Modified Paths:
--------------
csw/mgar/gar/v2/lib/python/checkpkg_lib.py
csw/mgar/gar/v2/lib/python/package_checks.py
Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2014-08-03 10:24:24 UTC (rev
23912)
+++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2014-08-03 11:04:47 UTC (rev
23913)
@@ -981,8 +981,7 @@
]
res = m.Pkginst.select(oac, join=join)
- pkgs = [x.pkgname for x in res]
- return pkgs
+ return [x.pkgname for x in res]
def GetPathsAndPkgnamesByBasename(self, basename, osrel, arch, catrel):
"""Retrieves pkginst names of packages that have certain files.
Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py 2014-08-03 10:24:24 UTC
(rev 23912)
+++ csw/mgar/gar/v2/lib/python/package_checks.py 2014-08-03 11:04:47 UTC
(rev 23913)
@@ -1350,6 +1350,8 @@
# This package better not be a stub.
# But how do we know it's a stub? We test for the presence of...
dep_data = error_mgr.GetPkgByPkgname(dep_pkgname)
+ if dep_data is None:
+ continue
if dep_data['catalogname'].endswith('_stub'):
error_mgr.ReportError(
'dependency-on-stub',
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
