Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 6e1d9f9
Remove bad initial attempt do fix conflict resolutions
Baptiste Daroussin committed 9 years ago
commit 6e1d9f926fa91b2f85ed7bc55d0c1371d0cfc763
parent 05d8dbc
2 files changed +2 -10
modified src/install.c
@@ -208,7 +208,6 @@ exec_install(int argc, char **argv)
		return (EX_TEMPFAIL);

	}
- 
again:

	if (pkg_jobs_new(&jobs, PKG_JOBS_INSTALL, db) != EPKG_OK)

		goto cleanup;
@@ -247,10 +246,7 @@ again:
				printf("Conflicts with the existing packages "

				    "have been found.\nOne more solver "

				    "iteration is needed to resolve them.\n");
- 
				pkg_jobs_free(jobs);
- 
				jobs = NULL;
- 
				done = 0;
- 
				goto again;
+ 
				continue;

			}

			else if (retcode != EPKG_OK)

				goto cleanup;
modified src/upgrade.c
@@ -163,7 +163,6 @@ exec_upgrade(int argc, char **argv)
		return (EX_TEMPFAIL);

	}
- 
again:

	if (pkg_jobs_new(&jobs, PKG_JOBS_UPGRADE, db) != EPKG_OK)

		goto cleanup;
@@ -202,10 +201,7 @@ again:
				printf("Conflicts with the existing packages "

				    "have been found.\nOne more solver "

				    "iteration is needed to resolve them.\n");
- 
				pkg_jobs_free(jobs);
- 
				jobs = NULL;
- 
				done = 0;
- 
				goto again;
+ 
				continue;

			}

			else if (retcode != EPKG_OK)

				goto cleanup;