Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › f4383e7
Merge remote-tracking branch 'upstream/master'
Matthew Seaman committed 13 years ago
commit f4383e7b965a8e596cfd36989cb08bc7a777d3fe
parent 37a5ca1
1 file changed +3 -2
modified libpkg/pkg_repo.c
@@ -605,7 +605,8 @@ pkg_create_repo(char *path, bool force, void (progress)(struct pkg *pkg, void *d
	while ((ent = fts_read(fts)) != NULL) {

		const char *name, *version, *origin, *comment, *desc;

		const char *arch, *maintainer, *www, *prefix;
- 
		int64_t flatsize, licenselogic;
+ 
		int64_t flatsize;
+ 
		lic_t licenselogic;



		/* skip everything that is not a file */

		if (ent->fts_info != FTS_F)
@@ -660,7 +661,7 @@ pkg_create_repo(char *path, bool force, void (progress)(struct pkg *pkg, void *d
	try_again:

		if ((ret = run_prepared_statement(PKG, origin, name, version,

		    comment, desc, arch, maintainer, www, prefix,
- 
		    ent->fts_statp->st_size, flatsize, licenselogic, cksum,
+ 
		    ent->fts_statp->st_size, flatsize, (int64_t)licenselogic, cksum,

		    pkg_path)) != SQLITE_DONE) {

			if (ret == SQLITE_CONSTRAINT) {

				switch(maybe_delete_conflicting(origin,