Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 1ec67c9
repo: stop producing meta.pkg file it has been unused since pkg 1.13
Baptiste Daroussin committed 2 years ago
commit 1ec67c9863352d23c477b27ab985ecd0e77e28be
parent 95ab4a4
1 file changed +2 -12
modified libpkg/pkg_repo_create.c
@@ -505,13 +505,6 @@ pkg_repo_create_pack_and_sign(struct pkg_repo_create *prc)
	pkg_emit_progress_tick(nfile++, files_to_pack);



	snprintf(repo_path, sizeof(repo_path), "%s/%s", prc->outdir,
- 
		repo_meta_file);
- 
	if (pkg_repo_pack_db(repo_meta_file, repo_path, repo_path, keyinfo, prc) != EPKG_OK) {
- 
		ret = EPKG_FATAL;
- 
		goto cleanup;
- 
	}
-
- 
	snprintf(repo_path, sizeof(repo_path), "%s/%s", prc->outdir,

	    prc->meta->manifests);

	snprintf(repo_archive, sizeof(repo_archive), "%s/%s", prc->outdir,

		prc->meta->manifests_archive);
@@ -545,8 +538,8 @@ pkg_repo_create_pack_and_sign(struct pkg_repo_create *prc)
	pkg_emit_progress_tick(nfile++, files_to_pack);



	/* Now we need to set the equal mtime for all archives in the repo */
- 
	snprintf(repo_archive, sizeof(repo_archive), "%s/%s.pkg",
- 
	    prc->outdir, repo_meta_file);
+ 
	snprintf(repo_archive, sizeof(repo_archive), "%s/meta.conf",
+ 
	    prc->outdir);

	if (stat(repo_archive, &st) == 0) {

		struct timeval ftimes[2] = {

			{
@@ -569,9 +562,6 @@ pkg_repo_create_pack_and_sign(struct pkg_repo_create *prc)
		snprintf(repo_archive, sizeof(repo_archive),

			"%s/%s.pkg", prc->outdir, prc->meta->data_archive);

		utimes(repo_archive, ftimes);
- 
		snprintf(repo_archive, sizeof(repo_archive),
- 
			"%s/%s.pkg", prc->outdir, repo_meta_file);
- 
		utimes(repo_archive, ftimes);

	}



cleanup: