Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 5ab26d1
Merge branch 'master' of github.com:pkgng/pkgng
Matthew Seaman committed 13 years ago
commit 5ab26d1456518791d75abd2020cc4207ff654968
parent e02a1e2
5 files changed +18 -18
modified libpkg/pkgdb.c
@@ -1792,7 +1792,9 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete)
	const char *comment, *desc, *message, *infos;

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

	int64_t i;



	assert(db != NULL);
@@ -1830,7 +1832,7 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete)
	 * Insert package record

	 */

	ret = run_prstmt(PKG, origin, name, version, comment, desc, message,
- 
	    arch, maintainer, www, prefix, flatsize, automatic, licenselogic,
+ 
	    arch, maintainer, www, prefix, flatsize, (int64_t)automatic, (int64_t)licenselogic,

	    mtree, infos);

	if (ret != SQLITE_DONE) {

		ERROR_SQLITE(s);
@@ -2691,17 +2693,17 @@ pkgdb_query_upgrades(struct pkgdb *db, const char *repo, bool all)
	const char pkgjobs_sql_1[] = "INSERT OR IGNORE INTO pkgjobs (pkgid, origin, name, version, comment, desc, arch, "

			"maintainer, www, prefix, flatsize, newversion, pkgsize, "

			"cksum, repopath, automatic, opts) "
- 
			"SELECT id, origin, name, version, comment, desc, "
- 
			"arch, maintainer, www, prefix, flatsize, version AS newversion, pkgsize, "
- 
			"cksum, path, 0 ,"
- 
			"(select group_concat(option) from (select option from '%s'.options WHERE package_id=id AND value='on' ORDER BY option)) "
- 
			"FROM '%s'.packages WHERE origin IN (select origin from main.packages)";
+ 
			"SELECT r.id, r.origin, r.name, r.version, r.comment, r.desc, "
+ 
			"r.arch, r.maintainer, r.www, r.prefix, r.flatsize, r.version AS newversion, r.pkgsize, "
+ 
			"r.cksum, r.path, l.automatic ,"
+ 
			"(select group_concat(option) from (select option from '%s'.options WHERE package_id=r.id AND value='on' ORDER BY option)) "
+ 
			"FROM '%s'.packages r INNER JOIN main.packages l ON l.origin = r.origin";



	const char pkgjobs_sql_2[] = "INSERT OR IGNORE INTO pkgjobs (pkgid, origin, name, version, comment, desc, arch, "

				"maintainer, www, prefix, flatsize, newversion, pkgsize, "

				"cksum, repopath, automatic, opts) "

				"SELECT DISTINCT r.id, r.origin, r.name, r.version, r.comment, r.desc, "
- 
				"r.arch, r.maintainer, r.www, r.prefix, r.flatsize, r.version AS newversion, r.pkgsize, "
+ 
				"r.arch, r.maintainer, r.www, r.prefix, r.flatsize, NULL AS newversion, r.pkgsize, "

				"r.cksum, r.path, 1, "

				"(select group_concat(option) from (select option from '%s'.options WHERE package_id=r.id AND value='on' ORDER BY option)) "

				"FROM '%s'.packages AS r where r.origin IN "
modified pkg/pkg-create.8
@@ -272,17 +272,16 @@ for further description.
.It Ev PORTSDIR

.El

.\" ---------------------------------------------------------------------------
+ 
.Sh FILES
+ 
See
+ 
.Xr pkg.conf 5 .
+ 
.\" ---------------------------------------------------------------------------

.Sh EXAMPLES

Create package files for installed packages:

.Dl % pkg create -a -o /usr/ports/packages/All

.Pp

Create package file for pkg:

.Dl % pkg create -o /usr/ports/packages/All pkg
- 
.Pp
- 
.\" ---------------------------------------------------------------------------
- 
.Sh FILES
- 
See
- 
.Xr pkg.conf 5 .

.\" ---------------------------------------------------------------------------

.Sh SEE ALSO

.Xr pkg 8 ,
modified pkg/pkg-fetch.8
@@ -72,7 +72,7 @@ Don't auto update the remote database with
.Xr pkg-update 8 .

Use the local cache only.

.It Fl d
- 
Fetch the package and it's dependencies as well.
+ 
Fetch the package and its dependencies as well.

.El

.Sh ENVIRONMENT

The following environment variables affect the execution of
modified pkg/pkg-updating.8
@@ -55,6 +55,9 @@ The following environment variables affect the execution of
.It Ev PORTSDIR

Location of the ports tree.

.El
+ 
.Sh FILES
+ 
See
+ 
.Xr pkg.conf 5 .

.Sh EXAMPLES

Shows all entries of all installed ports:

.Dl % pkg updating
@@ -71,9 +74,6 @@ Shows all apache entries since 2012-01-01:
Defines that the UPDATING file is in /tmp and shows all entries of all

installed ports:

.Dl % pkg updating -f /tmp/UPDATING
- 
.Sh FILES
- 
See
- 
.Xr pkg.conf 5 .

.Sh SEE ALSO

.Xr pkg 8 ,

.Xr pkg-add 8 ,
modified pkg/pkg.conf.5
@@ -46,7 +46,6 @@ specified in the configuration file -
.Fa YES, TRUE

and

.Fa ON.
- 
.Pp

.Sh OPTIONS

The following options can be defined in

.Nm :