Radish alpha
H
HardenedBSD-pkg
HardenedBSD Package Manager
Radicle
Git (anonymous pull)
Log in to clone via SSH
Commits ›
Merge branch 'master' of github.com:pkgng/pkgng
Baptiste Daroussin committed 14 years ago
commit 037bd056a1ab010a6f1f11f32f944decd94d95f2
parent f4f9a489e527bac34f123eb6b6e139d9668be7c0
5 files changed +19 -15
modified libpkg/pkg_jobs.c
@@ -121,7 +121,7 @@ pkg_jobs_upgrade(struct pkg_jobs *j)
	struct pkgdb_it *it;

	const char *cachedir;

	char path[MAXPATHLEN + 1];
- 
	int retcode;
+ 
	int retcode = EPKG_FATAL;;



	/* Fetch */

	while (pkg_jobs(j, &p) == EPKG_OK) {
@@ -135,23 +135,29 @@ pkg_jobs_upgrade(struct pkg_jobs *j)
		/* no need to reinstall package already installed */

		if (p->type == PKG_INSTALLED)

			continue;
+
+ 
		snprintf(path, sizeof(path), "%s/%s", cachedir,
+ 
			 pkg_get(p, PKG_REPOPATH));
+ 


		/* get the installed pkg if any */

		it = pkgdb_query(j->db, pkg_get(p, PKG_ORIGIN), MATCH_EXACT);
- 
		snprintf(path, sizeof(path), "%s/%s", cachedir,
- 
				pkg_get(p, PKG_REPOPATH));

		if (pkgdb_it_next(it, &oldpkg, PKG_LOAD_BASIC) == EPKG_OK) {

			retcode = pkg_upgrade(j->db, oldpkg, path);

		} else {

			retcode = pkg_upgrade(j->db, NULL, path);

		}
+ 
		pkgdb_it_free(it);
+ 


		if (retcode != EPKG_OK)
- 
			return (retcode);
+ 
			goto cleanup;

	}
- 
	pkgdb_it_free(it);
+ 
	retcode = EPKG_OK;
+
+ 
	cleanup:

	pkg_free(oldpkg);
- 
	return (EPKG_OK);
+ 
	return (retcode);

}



static int
modified pkg/register.c
@@ -170,7 +170,6 @@ exec_register(int argc, char **argv)
	} else {

		pkg_set(pkg, PKG_OSVERSION, u.release);

	}
- 
	/* TODO: missing osversion get it from uname*/



	ret += ports_parse_plist(pkg, plist);
modified pkg/updating.c
@@ -38,9 +38,9 @@ exec_updating(int argc, char **argv)
	char *tmp;

	int head = 0;

	int found = 0;
- 
	struct pkgdb *db;
- 
	struct pkg *pkg;
- 
	struct pkgdb_it *it;
+ 
	struct pkgdb *db = NULL;
+ 
	struct pkg *pkg = NULL;
+ 
	struct pkgdb_it *it = NULL;

	FILE *fd;



	while ((ch = getopt(argc, argv, "d:f:")) != -1) {
modified pkg/upgrade.c
@@ -26,7 +26,7 @@ int
exec_upgrade(int argc, char **argv)

{

	struct pkgdb *db = NULL;
- 
	struct pkgdb_it *it;
+ 
	struct pkgdb_it *it = NULL;

	struct pkg *pkg = NULL;

	struct pkg_jobs *jobs = NULL;

	int retcode = 1;
modified pkg/version.c
@@ -78,6 +78,9 @@ print_version(struct pkg *pkg, const char *source, const char *ver, char limchar
			case 1:

				key = '>';

				break;
+ 
			default:
+ 
				key = '!';
+ 
				break;

		}

	}
@@ -133,7 +136,6 @@ exec_version(int argc, char **argv)
	struct pkgdb *db = NULL;

	struct pkg *pkg = NULL;

	struct pkgdb_it *it = NULL;
- 
	char key;

	char limchar = '-';

	struct sbuf *cmd;

	struct sbuf *res;
@@ -223,7 +225,6 @@ exec_version(int argc, char **argv)


		while ((linelen = getline(&line, &linecap, indexfile)) > 0) {

			/* line is pkgname|portdir|... */
- 
			buf = line;

			buf = strchr(line, '|');

			buf[0] = '\0';

			buf++;
@@ -256,7 +257,6 @@ exec_version(int argc, char **argv)
			goto cleanup;



		while (pkgdb_it_next(it, &pkg, PKG_LOAD_BASIC) == EPKG_OK) {
- 
			key = '!';

			SLIST_FOREACH(entry, &indexhead, next) {

				if (!strcmp(entry->origin, pkg_get(pkg, PKG_ORIGIN))) {

					print_version(pkg, "index", entry->version, limchar, opt);
@@ -273,7 +273,6 @@ exec_version(int argc, char **argv)
			goto cleanup;



		while (pkgdb_it_next(it, &pkg, PKG_LOAD_BASIC) == EPKG_OK) {
- 
			key = '!';

			cmd = sbuf_new_auto();

			sbuf_printf(cmd, "make -C %s/%s -VPKGVERSION", pkg_config("PORTSDIR"), pkg_get(pkg, PKG_ORIGIN));

			sbuf_finish(cmd);