From owner-svn-soc-all@FreeBSD.ORG Thu Aug 29 15:06:01 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 986DAFE0 for ; Thu, 29 Aug 2013 15:06:01 +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 84DFF2EA9 for ; Thu, 29 Aug 2013 15:06:01 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7TF61Qt021240 for ; Thu, 29 Aug 2013 15:06:01 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r7TF61Wo021234 for svn-soc-all@FreeBSD.org; Thu, 29 Aug 2013 15:06:01 GMT (envelope-from mattbw@FreeBSD.org) Date: Thu, 29 Aug 2013 15:06:01 GMT Message-Id: <201308291506.r7TF61Wo021234@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: r256693 - 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: Thu, 29 Aug 2013 15:06:01 -0000 Author: mattbw Date: Thu Aug 29 15:06:01 2013 New Revision: 256693 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=256693 Log: Fix Resolve bug. This was caused by garbage being provided as the repository of the returned PackageID, as the call for pulling the repo information out of the resolved package was missing. In a somewhat backwards approach, the unit tests for the package to PackageID call will land in the next commit or so. Some rearranging will be needed to allow pkgutils to be tested. Modified: soc2013/mattbw/backend/pkgutils.c Modified: soc2013/mattbw/backend/pkgutils.c ============================================================================== --- soc2013/mattbw/backend/pkgutils.c Thu Aug 29 13:56:44 2013 (r256692) +++ soc2013/mattbw/backend/pkgutils.c Thu Aug 29 15:06:01 2013 (r256693) @@ -170,7 +170,8 @@ pkg_get(pkg, PKG_NAME, strv + PK_PACKAGE_ID_NAME, PKG_VERSION, strv + PK_PACKAGE_ID_VERSION, - PKG_ARCH, strv + PK_PACKAGE_ID_ARCH); + PKG_ARCH, strv + PK_PACKAGE_ID_ARCH, + PKG_REPONAME, strv + PK_PACKAGE_ID_DATA); return pk_package_id_build(strv[PK_PACKAGE_ID_NAME], strv[PK_PACKAGE_ID_VERSION],