Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › eb4f6d3
When analysing ELF files with DEVELOPER_MODE, don't bail on first error
Bryan Drewery committed 11 years ago
commit eb4f6d30ad16795582ded41e704d926642c4b863
parent bfe76d6
1 file changed +8 -3
modified libpkg/pkg_elf.c
@@ -449,7 +449,7 @@ pkg_analyse_files(struct pkgdb *db, struct pkg *pkg, const char *stage)
	int ret = EPKG_OK;

	char fpath[MAXPATHLEN];

	const char *origin;
- 
	bool developer = false;
+ 
	bool developer = false, failures = false;



	developer = pkg_object_bool(pkg_config_get("DEVELOPER_MODE"));
@@ -479,8 +479,10 @@ pkg_analyse_files(struct pkgdb *db, struct pkg *pkg, const char *stage)


		ret = analyse_elf(pkg, fpath, add_shlibs_to_pkg, db);

		if (developer) {
- 
			if (ret != EPKG_OK && ret != EPKG_END)
- 
				goto cleanup;
+ 
			if (ret != EPKG_OK && ret != EPKG_END) {
+ 
				failures = true;
+ 
				continue;
+ 
			}

			analyse_fpath(pkg, fpath);

		}

	}
@@ -499,6 +501,9 @@ pkg_analyse_files(struct pkgdb *db, struct pkg *pkg, const char *stage)
		}

	}
+ 
	if (failures)
+ 
		goto cleanup;
+ 


	ret = EPKG_OK;



cleanup: