From owner-svn-soc-all@FreeBSD.ORG Tue Aug 13 21:42:58 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 F034B6CA for ; Tue, 13 Aug 2013 21:42:58 +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 DD68C27F9 for ; Tue, 13 Aug 2013 21:42:58 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7DLgwNg092736 for ; Tue, 13 Aug 2013 21:42:58 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r7DLgwcp092734 for svn-soc-all@FreeBSD.org; Tue, 13 Aug 2013 21:42:58 GMT (envelope-from mattbw@FreeBSD.org) Date: Tue, 13 Aug 2013 21:42:58 GMT Message-Id: <201308132142.r7DLgwcp092734@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: r255897 - soc2013/mattbw/backend 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: Tue, 13 Aug 2013 21:42:59 -0000 Author: mattbw Date: Tue Aug 13 21:42:58 2013 New Revision: 255897 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=255897 Log: Added some more event handlers. This does not fully fix the issue of some jobs exiting with only "Fatal error", but might remedy some situations. More investigation is required. Modified: soc2013/mattbw/backend/event.c Modified: soc2013/mattbw/backend/event.c ============================================================================== --- soc2013/mattbw/backend/event.c Tue Aug 13 20:38:55 2013 (r255896) +++ soc2013/mattbw/backend/event.c Tue Aug 13 21:42:58 2013 (r255897) @@ -87,6 +87,11 @@ event->e_integrity_conflict.pkg_name); break; case PKG_EVENT_NEWPKGVERSION: + /* TODO: find a better enum for this? */ + ERR(backend, + PK_ERROR_ENUM_PACKAGE_INSTALL_BLOCKED, + "A new version of pkg is available; install that first."); + break; case PKG_EVENT_NOTICE: case PKG_EVENT_INCREMENTAL_UPDATE: /* Unimplemented */ @@ -99,12 +104,34 @@ break; case PKG_EVENT_ERRNO: case PKG_EVENT_ARCHIVE_COMP_UNSUP: + /* Unimplemented */ + break; case PKG_EVENT_ALREADY_INSTALLED: + ERR(backend, + PK_ERROR_ENUM_PACKAGE_ALREADY_INSTALLED, + "Already installed."); + break; case PKG_EVENT_FAILED_CKSUM: case PKG_EVENT_CREATE_DB_ERROR: + /* Unimplemented */ + break; case PKG_EVENT_LOCKED: + /* TODO: find a better enum for this? */ + ERR(backend, + PK_ERROR_ENUM_PACKAGE_INSTALL_BLOCKED, + "Package is locked."); + break; case PKG_EVENT_REQUIRED: + /* TODO: find a better enum for this? */ + ERR(backend, + PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE, + "Package is required."); + break; case PKG_EVENT_MISSING_DEP: + ERR(backend, + PK_ERROR_ENUM_DEP_RESOLUTION_FAILED, + "Package is missing a dependency."); + break; case PKG_EVENT_NOREMOTEDB: case PKG_EVENT_NOLOCALDB: /* Unimplemented */