pkgng

Check-in [69e6d75557]
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 | release-1.1
Files: files | file ages | folders
SHA1:69e6d75557b884019728a7456ed3e53b228c7f27
User & Date: bryan@shatow.net 2013-09-24 21:45:17
Context
2013-09-30
16:01
Fix deinstallation message to say it will free space Reported by: mva check-in: 1c41af1196 user: bryan@shatow.net tags: trunk, multi-repos, stash, release-1.1
2013-09-24
21:45
Disable support for autoplist in staging as it breaks meta ports check-in: 69e6d75557 user: bryan@shatow.net tags: trunk, multi-repos, stash, release-1.1
2013-09-10
05:56
Remove stray reference to the -X option, which was removed months ago. Fixes #586 check-in: 4b939ad378 user: m.seaman@infracaninophile.co.uk tags: trunk, multi-repos, stash, release-1.1
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to libpkg/pkg_create.c.

319
320
321
322
323
324
325

326
327
328
329
330
331
332
333
	/* 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);
	}







>
|







319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
	/* 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);
	}