Date: Sun, 1 Sep 2013 23:16:50 GMT From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r256816 - in soc2013/mattbw/backend: . jobs Message-ID: <201309012316.r81NGoG2076769@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309012316.r81NGoG2076769>