From owner-svn-soc-all@FreeBSD.ORG Sun Sep 1 23:16:50 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 A636BA86 for ; Sun, 1 Sep 2013 23:16:50 +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 790232C08 for ; Sun, 1 Sep 2013 23:16:50 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r81NGom1076773 for ; Sun, 1 Sep 2013 23:16:50 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r81NGoG2076769 for svn-soc-all@FreeBSD.org; Sun, 1 Sep 2013 23:16:50 GMT (envelope-from mattbw@FreeBSD.org) Date: Sun, 1 Sep 2013 23:16:50 GMT Message-Id: <201309012316.r81NGoG2076769@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: r256816 - in 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: Sun, 01 Sep 2013 23:16:50 -0000 Author: mattbw Date: Sun Sep 1 23:16:50 2013 New Revision: 256816 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=256816 Log: Fix broken namever free references. This also changes the repo type checking code to use names instead of idents, but jobs are currently broken because they still expect idents. Modified: soc2013/mattbw/backend/jobs/core.h soc2013/mattbw/backend/jobs/do.c soc2013/mattbw/backend/utils.c Modified: soc2013/mattbw/backend/jobs/core.h ============================================================================== --- soc2013/mattbw/backend/jobs/core.h Sun Sep 1 22:30:24 2013 (r256815) +++ soc2013/mattbw/backend/jobs/core.h Sun Sep 1 23:16:50 2013 (r256816) @@ -32,6 +32,5 @@ struct pkg_jobs *jobs_allocate(pkg_jobs_t type, struct pkgdb *db); void jobs_emit_packages(struct pkg_jobs *jobs, PkBackend *backend, pkg_info_ptr info); void jobs_free(struct pkg_jobs **jobs_p); -void jobs_free_namevers(char ***namevers_p, guint count); #endif /* !_PKGNG_BACKEND_JOBS_CORE_H_ */ Modified: soc2013/mattbw/backend/jobs/do.c ============================================================================== --- soc2013/mattbw/backend/jobs/do.c Sun Sep 1 22:30:24 2013 (r256815) +++ soc2013/mattbw/backend/jobs/do.c Sun Sep 1 23:16:50 2013 (r256816) @@ -27,6 +27,7 @@ #include "pkg.h" /* pkg_... */ #include "../db.h" /* db_... */ +#include "../namever.h" /* namever_array_free */ #include "../utils.h" /* get_package_ids */ #include "check.h" /* jobs_check_... */ #include "core.h" /* jobs_... */ @@ -230,7 +231,7 @@ } pkg_jobs_free(jobs); - jobs_free_namevers(&namevers, count); + namever_array_free(&namevers, count); } return success; @@ -275,7 +276,7 @@ ERR(spec->backend, PK_ERROR_ENUM_DEP_RESOLUTION_FAILED, "could not solve the job"); - } + } return solved; } Modified: soc2013/mattbw/backend/utils.c ============================================================================== --- soc2013/mattbw/backend/utils.c Sun Sep 1 22:30:24 2013 (r256815) +++ soc2013/mattbw/backend/utils.c Sun Sep 1 23:16:50 2013 (r256816) @@ -42,7 +42,7 @@ rtype = REPO_ANY; } else if (strcmp(name, "installed") == 0) { rtype = REPO_LOCAL; - } else if (pkg_repo_find_ident(name) != NULL) { + } else if (pkg_repo_find_name(name) != NULL) { rtype = REPO_REMOTE; } else { rtype = REPO_INVALID;