pkgng

Check-in [ce7d16d36f]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Disable support for autoplist in staging as it breaks meta ports
Timelines: family | ancestors | descendants | both | trunk | multi-repos | stash
Files: files | file ages | folders
SHA1: ce7d16d36fba6560a46d17afb59286e2ea152fa3
User & Date: bryan@shatow.net 2013-09-24 21:44:29
Context
2013-09-24
21:51
Make do_extract_mtree available throught the private API check-in: 6fdc43c62e user: bapt@FreeBSD.org tags: trunk, multi-repos, stash
21:44
Disable support for autoplist in staging as it breaks meta ports check-in: ce7d16d36f user: bryan@shatow.net tags: trunk, multi-repos, stash
2013-09-23
05:27
Merge pull request #596 from so14k/fix-sql-trigger - Fix typo in trigger introduced in check-in: 757e60dc31 user: m.seaman@infracaninophile.co.uk tags: trunk, multi-repos, stash
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to libpkg/pkg_create.c.

335
336
337
338
339
340
341

342
343
344
345
346
347
348
349
	/* Create the archive */
	pkg_archive = pkg_create_archive(outdir, pkg, format, 0);
	if (pkg_archive == NULL) {
		ret = EPKG_FATAL; /* XXX do better */
		goto cleanup;
	}


	if (pkg_files(pkg, &file) != EPKG_OK &&
	    pkg_dirs(pkg, &dir) != EPKG_OK) {
		/* Now traverse the file directories, adding to the archive */
		packing_append_tree(pkg_archive, md_dir, NULL);
		packing_append_tree(pkg_archive, rootdir, "/");
	} else {
		pkg_create_from_dir(pkg, rootdir, pkg_archive);
	}







>
|







335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
	/* Create the archive */
	pkg_archive = pkg_create_archive(outdir, pkg, format, 0);
	if (pkg_archive == NULL) {
		ret = EPKG_FATAL; /* XXX do better */
		goto cleanup;
	}

	/* XXX: autoplist support doesn't work right with meta-ports */
	if (0 && pkg_files(pkg, &file) != EPKG_OK &&
	    pkg_dirs(pkg, &dir) != EPKG_OK) {
		/* Now traverse the file directories, adding to the archive */
		packing_append_tree(pkg_archive, md_dir, NULL);
		packing_append_tree(pkg_archive, rootdir, "/");
	} else {
		pkg_create_from_dir(pkg, rootdir, pkg_archive);
	}