pkgsrc/pkgtools/pkg_install/files/info/perform.c - diff

Return to perform.c CVS log

Up to [cvs.NetBSD.org] / pkgsrc / pkgtools / pkg_install / files / info

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

version 1.46, 2008/04/04 15:21:32

version 1.47, 2008/04/26 14:56:34

Line 126 static const struct pkg_meta_desc {

int entry_mask;

int required_file;

} pkg_meta_descriptors[] = {

{ offsetof(struct pkg_meta, meta_contents), CONTENTS_FNAME ,

{ offsetof(struct pkg_meta, meta_contents), CONTENTS_FNAME,

LOAD_CONTENTS, 1},

{ offsetof(struct pkg_meta, meta_comment), COMMENT_FNAME,

LOAD_COMMENT, 1 },

Line 302 pkg_do(const char *pkg)

int code = 0;

const char *binpkgfile = NULL;

if (IS_URL(pkg)) {

if (IS_URL(pkg) || (fexists(pkg) && isfile(pkg))) {

#ifdef BOOTSTRAP

errx(2, "Remote access not supported during bootstrap");

#else

struct archive *archive;

void *remote_archive_cookie;

archive = open_remote_archive(pkg, &remote_archive_cookie);

meta = read_meta_data_from_archive(archive);

close_remote_archive(remote_archive_cookie);

#endif

} else if (fexists(pkg) && isfile(pkg)) {

#ifdef BOOTSTRAP

errx(2, "Binary packages not supported during bootstrap");

#else

struct archive *archive;

void *remote_archive_cookie;

void *archive_cookie;

archive = open_local_archive(pkg, &remote_archive_cookie);

archive = open_archive(pkg, &archive_cookie);

meta = read_meta_data_from_archive(archive);

close_local_archive(remote_archive_cookie);

close_archive(archive_cookie);

binpkgfile = pkg;

if (!IS_URL(pkg))

binpkgfile = pkg;

#endif

} else {