From owner-svn-soc-all@FreeBSD.ORG Mon Sep 2 19:03:40 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D58EFF39 for ; Mon, 2 Sep 2013 19:03:40 +0000 (UTC) (envelope-from mattbw@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B35412AF2 for ; Mon, 2 Sep 2013 19:03:40 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r82J3e30078494 for ; Mon, 2 Sep 2013 19:03:40 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r82J3eNa078483 for svn-soc-all@FreeBSD.org; Mon, 2 Sep 2013 19:03:40 GMT (envelope-from mattbw@FreeBSD.org) Date: Mon, 2 Sep 2013 19:03:40 GMT Message-Id: <201309021903.r82J3eNa078483@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mattbw@FreeBSD.org using -f From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r256842 - soc2013/mattbw/backend/jobs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Sep 2013 19:03:40 -0000 Author: mattbw Date: Mon Sep 2 19:03:40 2013 New Revision: 256842 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=256842 Log: Output exact package that failed a suitability check. This is mainly for debugging purposes. Modified: soc2013/mattbw/backend/jobs/check.c soc2013/mattbw/backend/jobs/check.h soc2013/mattbw/backend/jobs/do.c Modified: soc2013/mattbw/backend/jobs/check.c ============================================================================== --- soc2013/mattbw/backend/jobs/check.c Mon Sep 2 18:25:18 2013 (r256841) +++ soc2013/mattbw/backend/jobs/check.c Mon Sep 2 19:03:40 2013 (r256842) @@ -34,33 +34,36 @@ #include "check.h" /* jobs_check_... */ static bool jobs_check_id_on_package(struct pkg *pkg, struct query_id *query_id, const char *namever); -static bool jobs_check_query_ids(struct pkg_jobs *jobs, struct query_id *query_ids, guint count, bool reject_non_updates); +static struct pkg *jobs_check_query_ids(struct pkg_jobs *jobs, struct query_id *query_ids, guint count, bool reject_non_updates); /* Checks a solved job against a string vector of PackageIDs to ensure any * packages that match the PackageIDs match them fully. + * + * Returns NULL if the check succeeded, and a struct pkg if that package + * failed the check. */ -bool +struct pkg * jobs_check_package_ids(struct pkg_jobs *jobs, gchar **package_ids, guint count, bool reject_non_updates) { - bool success; + struct pkg *package; struct query_id *query_ids; assert(jobs != NULL); assert(package_ids != NULL); assert(0 < count); - success = false; + package = NULL; query_ids = query_id_array_from_package_ids(package_ids, count); if (query_ids != NULL) { /* Now do the actual checking, per package. */ - success = jobs_check_query_ids(jobs, query_ids, count, + package = jobs_check_query_ids(jobs, query_ids, count, reject_non_updates); } - return success; + return package; } static bool @@ -86,7 +89,7 @@ } -static bool +static struct pkg * jobs_check_query_ids(struct pkg_jobs *jobs, struct query_id *query_ids, guint count, bool reject_non_updates) { @@ -141,5 +144,5 @@ /* Do not free the struct pkg, we actually don't own it. */ } - return success; + return success ? NULL : package; } Modified: soc2013/mattbw/backend/jobs/check.h ============================================================================== --- soc2013/mattbw/backend/jobs/check.h Mon Sep 2 18:25:18 2013 (r256841) +++ soc2013/mattbw/backend/jobs/check.h Mon Sep 2 19:03:40 2013 (r256842) @@ -25,6 +25,6 @@ #include /* bool */ #include "../pkg.h" /* pkg_... */ -bool jobs_check_package_ids(struct pkg_jobs *jobs, gchar **package_ids, guint count, bool reject_non_updates); +struct pkg *jobs_check_package_ids(struct pkg_jobs *jobs, gchar **package_ids, guint count, bool reject_non_updates); #endif /* !_PKGNG_BACKEND_JOBS_CHECK_H_ */ Modified: soc2013/mattbw/backend/jobs/do.c ============================================================================== --- soc2013/mattbw/backend/jobs/do.c Mon Sep 2 18:25:18 2013 (r256841) +++ soc2013/mattbw/backend/jobs/do.c Mon Sep 2 19:03:40 2013 (r256842) @@ -28,6 +28,7 @@ #include "../db.h" /* db_... */ #include "../namever.h" /* namever_array_free */ +#include "../pkgutils.h" /* pkgutils_... */ #include "../utils.h" /* get_package_ids */ #include "check.h" /* jobs_check_... */ #include "core.h" /* jobs_... */ @@ -103,28 +104,39 @@ jobs_do_check(const struct jobs_spec *spec, struct pkg_jobs *jobs, gchar **package_ids, guint count) { - bool success; + struct pkg *failed_package; assert(spec != NULL); assert(jobs != NULL); assert(package_ids != NULL || 0 == count); assert(package_ids == NULL || 0 < count); - success = true; + failed_package = NULL; if (package_ids != NULL) { - success = jobs_check_package_ids(jobs, package_ids, count, - spec->reject_non_updates); + failed_package = jobs_check_package_ids(jobs, package_ids, + count, spec->reject_non_updates); } - if (!success) { + if (failed_package != NULL) { + char *message; + char *package_id; + + package_id = pkgutils_pkg_to_id(failed_package); + message = NULL; + (void)asprintf(&message, + "(internal error) package %s failed suitability check.", + package_id); ERR(spec->backend, PK_ERROR_ENUM_DEP_RESOLUTION_FAILED, - "packages failed suitability check"); + message); + + g_free(package_id); + free(message); } - assert(0 < count || success); + assert(0 < count || failed_package == NULL); - return success; + return (failed_package == NULL); } static bool