Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 4fd3822
libpkg: Remove the PKG_DELETE_CONFLICT flag
Mark Johnston committed 3 years ago
commit 4fd382236faa1e8e98d620e3cc04ba6fcaf98ccc
parent eea1a99
2 files changed +2 -9
modified libpkg/pkg_jobs.c
@@ -2244,14 +2244,8 @@ pkg_jobs_execute(struct pkg_jobs *j)
					goto cleanup;

				}

			}
- 
			/*
- 
			 * Assume that in upgrade we can remove packages with rdeps as
- 
			 * in further they will be upgraded correctly.
- 
			 */
- 
			if (j->type == PKG_JOBS_UPGRADE)
- 
				retcode = pkg_delete(p, j->db, flags | PKG_DELETE_CONFLICT, &j->triggers);
- 
			else
- 
				retcode = pkg_delete(p, j->db, flags, &j->triggers);
+
+ 
			retcode = pkg_delete(p, j->db, flags, &j->triggers);

			if (retcode != EPKG_OK)

				goto cleanup;

			break;
modified libpkg/private/pkg.h
@@ -619,7 +619,6 @@ int pkg_delete(struct pkg *pkg, struct pkgdb *db, unsigned flags, struct trigger
#define PKG_DELETE_FORCE (1<<0)

#define PKG_DELETE_UPGRADE (1<<1)

#define PKG_DELETE_NOSCRIPT (1<<2)
- 
#define PKG_DELETE_CONFLICT (1<<3)



int pkg_fetch_file_to_fd(struct pkg_repo *repo, const char *url, int dest,

    time_t *t, ssize_t offset, int64_t size, bool silent);