diff -r cae6308aa5b1 -r 29d5002bd17f rpm.c
--- a/rpm.c	Sun Jun 15 18:16:20 2008 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,757 +0,0 @@
-/*
- * Copyright (C) 2008  Kristian Høgsberg <krh@redhat.com>
- * Copyright (C) 2008  Red Hat, Inc
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <stdio.h>
-#include <stddef.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-#include <rpm/rpmlib.h>
-#include <rpm/rpmdb.h>
-#include <zlib.h>
-
-#include "razor.h"
-#include "razor-internal.h"
-
-#define	RPM_LEAD_SIZE 96
-
-struct rpm_header {
-	unsigned char magic[4];
-	unsigned char reserved[4];
-	int nindex;
-	int hsize;
-};
-
-struct rpm_header_index {
-	int tag;
-	int type;
-	int offset;
-	int count;
-};
-
-struct razor_rpm {
-	struct rpm_header *signature;
-	struct rpm_header *header;
-	const char **dirs;
-	const char *pool;
-	void *map;
-	size_t size;
-	void *payload;
-};
-
-static struct rpm_header_index *
-razor_rpm_get_header(struct razor_rpm *rpm, unsigned int tag)
-{
-	struct rpm_header_index *index, *end;
-
-	index = (struct rpm_header_index *) (rpm->header + 1);
-	end = index + ntohl(rpm->header->nindex);
-	while (index < end) {
-		if (ntohl(index->tag) == tag)
-			return index;
-		index++;
-	}
-
-	return NULL;
-}
-
-static const void *
-razor_rpm_get_indirect(struct razor_rpm *rpm,
-		       unsigned int tag, unsigned int *count)
-{
-	struct rpm_header_index *index;
-
-	index = razor_rpm_get_header(rpm, tag);
-	if (index != NULL) {
-		if (count)
-			*count = ntohl(index->count);
-
-		return rpm->pool + ntohl(index->offset);
-	}
-
-	return NULL;
-}
-
-static enum razor_version_relation
-rpm_to_razor_flags (uint_32 flags)
-{
-	switch (flags & (RPMSENSE_LESS | RPMSENSE_EQUAL | RPMSENSE_GREATER)) {
-	case RPMSENSE_LESS:
-		return RAZOR_VERSION_LESS;
-	case RPMSENSE_LESS|RPMSENSE_EQUAL:
-		return RAZOR_VERSION_LESS_OR_EQUAL;
-	case RPMSENSE_EQUAL:
-		return RAZOR_VERSION_EQUAL;
-	case RPMSENSE_GREATER|RPMSENSE_EQUAL:
-		return RAZOR_VERSION_GREATER_OR_EQUAL;
-	case RPMSENSE_GREATER:
-		return RAZOR_VERSION_GREATER;
-	}
-
-	/* FIXME? */
-	return RAZOR_VERSION_EQUAL;
-}
-
-static void
-import_properties(struct razor_importer *importer, unsigned long type,
-		  struct razor_rpm *rpm,
-		  int name_tag, int version_tag, int flags_tag)
-{
-	const char *name, *version;
-	const uint_32 *flags;
-	uint_32 f;
-	unsigned int i, count;
-
-	name = razor_rpm_get_indirect(rpm, name_tag, &count);
-	if (name == NULL)
-		return;
-
-	flags = razor_rpm_get_indirect(rpm, flags_tag, &count);
-
-	version = razor_rpm_get_indirect(rpm, version_tag, &count);
-	for (i = 0; i < count; i++) {
-		f = rpm_to_razor_flags(ntohl(flags[i]));
-		razor_importer_add_property(importer, name, f, version, type);
-		name += strlen(name) + 1;
-		version += strlen(version) + 1;
-	}
-}
-
-static void
-import_files(struct razor_importer *importer, struct razor_rpm *rpm)
-{
-	const char *name;
-	const uint32_t *index;
-	unsigned int i, count;
-	char buffer[256];
-
-	/* assert: count is the same for all arrays */
-
-	index = razor_rpm_get_indirect(rpm, RPMTAG_DIRINDEXES, &count);
-	name = razor_rpm_get_indirect(rpm, RPMTAG_BASENAMES, &count);
-	for (i = 0; i < count; i++) {
-		snprintf(buffer, sizeof buffer,
-			 "%s%s", rpm->dirs[ntohl(*index)], name);
-		razor_importer_add_file(importer, buffer);
-		name += strlen(name) + 1;
-		index++;
-	}
-}
-
-struct razor_rpm *
-razor_rpm_open(const char *filename)
-{
-	struct razor_rpm *rpm;
-	struct rpm_header_index *base, *index;
-	struct stat buf;
-	unsigned int count, i, nindex, hsize;
-	const char *name;
-	int fd;
-
-	rpm = malloc(sizeof *rpm);
-	memset(rpm, 0, sizeof *rpm);
-
-	fd = open(filename, O_RDONLY);
-	if (fd < 0) {
-		fprintf(stderr, "couldn't open %s\n", filename);
-		return NULL;
-	}
-
-	if (fstat(fd, &buf) < 0) {
-		fprintf(stderr, "failed to stat %s (%m)\n", filename);
-		return NULL;
-	}
-
-	rpm->size = buf.st_size;
-	rpm->map = mmap(NULL, rpm->size, PROT_READ, MAP_PRIVATE, fd, 0);
-	if (rpm->map == MAP_FAILED) {
-		fprintf(stderr, "couldn't mmap %s\n", filename);
-		return NULL;
-	}
-	close(fd);
-
-	rpm->signature = rpm->map + RPM_LEAD_SIZE;
-	nindex = ntohl(rpm->signature->nindex);
-	hsize = ntohl(rpm->signature->hsize);
-	rpm->header = (void *) (rpm->signature + 1) +
-		ALIGN(nindex * sizeof *index + hsize, 8);
-	nindex = ntohl(rpm->header->nindex);
-	hsize = ntohl(rpm->header->hsize);
-	rpm->payload = (void *) (rpm->header + 1) +
-		nindex * sizeof *index + hsize;
-
-	base = (struct rpm_header_index *) (rpm->header + 1);
-	rpm->pool = (void *) base + nindex * sizeof *index;
-
-	/* Look up dir names now so we can index them directly. */
-	name = razor_rpm_get_indirect(rpm, RPMTAG_DIRNAMES, &count);
-	if (name) {
-		rpm->dirs = calloc(count, sizeof *rpm->dirs);
-		for (i = 0; i < count; i++) {
-			rpm->dirs[i] = name;
-			name += strlen(name) + 1;
-		}
-	} else {
-		name = razor_rpm_get_indirect(rpm, RPMTAG_OLDFILENAMES,
-					      &count);
-		if (name) {
-			fprintf(stderr, "old filenames not supported\n");
-			return NULL;
-		}
-	}
-
-	return rpm;
-}
-
-struct cpio_file_header {
-	char magic[6];
-	char inode[8];
-	char mode[8];
-	char uid[8];
-	char gid[8];
-	char nlink[8];
-	char mtime[8];
-	char filesize[8];
-	char devmajor[8];
-	char devminor[8];
-	char rdevmajor[8];
-	char rdevminor[8];
-	char namesize[8];
-	char checksum[8];
-	char filename[0];
-};
-
-/* gzip flags */
-#define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
-#define HEAD_CRC     0x02 /* bit 1 set: header CRC present */
-#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
-#define ORIG_NAME    0x08 /* bit 3 set: original file name present */
-#define COMMENT      0x10 /* bit 4 set: file comment present */
-#define RESERVED     0xE0 /* bits 5..7: reserved */
-
-struct installer {
-	const char *root;
-	struct razor_rpm *rpm;
-	z_stream stream;
-	unsigned char buffer[32768];
-	size_t rest, length;
-};
-
-static int
-installer_inflate(struct installer *installer)
-{
-	size_t length;
-	int err;
-
-	if (installer->rest > sizeof installer->buffer)
-		length = sizeof installer->buffer;
-	else
-		length = installer->rest;
-
-	installer->stream.next_out = installer->buffer;
-	installer->stream.avail_out = length;
-	err = inflate(&installer->stream, Z_SYNC_FLUSH);
-	if (err != Z_OK && err != Z_STREAM_END) {
-		fprintf(stderr, "inflate error: %d (%m)\n", err);
-		return -1;
-	}
-
-	installer->rest -= length;
-	installer->length = length;
-
-	return 0;
-}
-
-static int
-installer_align(struct installer *installer, size_t size)
-{
-	unsigned char buffer[4];
-	int err;
-
-	installer->stream.next_out = buffer;
-	installer->stream.avail_out =
-		(size - installer->stream.total_out) & (size - 1);
-
-	if (installer->stream.avail_out == 0)
-		return 0;
-
-	err = inflate(&installer->stream, Z_SYNC_FLUSH);
-	if (err != Z_OK && err != Z_STREAM_END) {
-		fprintf(stderr, "inflate error: %d (%m)\n", err);
-		return -1;
-	}
-
-	return 0;
-}
-
-static int
-create_path(struct installer *installer, const char *path, unsigned int mode)
-{
-	char buffer[PATH_MAX];
-	struct stat buf;
-	int fd, ret;
-
-	if (razor_create_dir(installer->root, path) < 0)
-		return -1;
-
-	snprintf(buffer, sizeof buffer, "%s%s", installer->root, path);
-
-	switch (mode >> 12) {
-	case REG:
-		/* FIXME: handle the case where a file is already there. */
-		fd = open(buffer, O_WRONLY | O_CREAT | O_TRUNC, mode & 0x1ff);
-		if (fd < 0){
-			fprintf(stderr, "failed to create file %s\n", buffer);
-			return -1;
-		}
-		while (installer->rest > 0) {
-			if (installer_inflate(installer)) {
-				fprintf(stderr, "failed to inflate\n");
-				return -1;
-			}
-			if (razor_write(fd, installer->buffer,
-					installer->length)) {
-				fprintf(stderr, "failed to write payload\n");
-				return -1;
-			}
-		}
-		if (close(fd) < 0) {
-			fprintf(stderr, "failed to close %s: %m\n", buffer);
-			return -1;
-		}
-		return 0;
-	case XDIR:
-		ret = mkdir(buffer, mode & 0x1ff);
-		if (ret == 0 || errno != EEXIST)
-			return ret;
-		if (stat(buffer, &buf) || !S_ISDIR(buf.st_mode)) {
-			/* FIXME: also check that mode match. */
-			fprintf(stderr,
-				"%s exists but is not a directory\n", buffer);
-			return -1;
-		}
-		return 0;
-	case PIPE:
-	case CDEV:
-	case BDEV:
-	case SOCK:
-		printf("%s: unhandled file type %d\n", buffer, mode >> 12);
-		return 0;
-	case LINK:
-		if (installer_inflate(installer)) {
-			fprintf(stderr, "failed to inflate\n");
-			return -1;
-		}
-		if (installer->length >= sizeof installer->buffer) {
-			fprintf(stderr, "link name too long\n");
-			return -1;
-		}
-		installer->buffer[installer->length] = '\0';
-		if (symlink((const char *) installer->buffer, buffer)) {
-			fprintf(stderr, "failed to create symlink, %m\n");
-			return -1;
-		}
-		return 0;
-	default:
-		printf("%s: unknown file type %d\n", buffer, mode >> 12);
-		return 0;
-	}
-}
-
-static int
-run_script(struct installer *installer,
-	   unsigned int program_tag, unsigned int script_tag)
-{
-	int pid, status, fd[2];
-	const char *script = NULL, *program = NULL;
-
-	program = razor_rpm_get_indirect(installer->rpm, program_tag, NULL);
-	script = razor_rpm_get_indirect(installer->rpm, script_tag, NULL);
-	if (program == NULL && script == NULL) {
-		return 0;
-	} else if (program == NULL) {
-		program = "/bin/sh";
-	}
-
-	if (pipe(fd) < 0) {
-		fprintf(stderr, "failed to create pipe\n");
-		return -1;
-	}
-	pid = fork();
-	if (pid < 0) {
-		fprintf(stderr, "failed to fork, %m\n");
-	} else if (pid == 0) {
-		if (dup2(fd[0], STDIN_FILENO) < 0) {
-			fprintf(stderr, "failed redirect stdin, %m\n");
-			return -1;
-		}
-		if (close(fd[0]) < 0 || close(fd[1]) < 0) {
-			fprintf(stderr, "failed to close pipe, %m\n");
-			return -1;
-		}
-		if (chroot(installer->root) < 0) {
-			fprintf(stderr, "failed to chroot to %s, %m\n",
-				installer->root);
-			return -1;
-		}
-		printf("executing program %s in chroot %s\n",
-		       program, installer->root);
-		if (execl(program, program, NULL)) {
-			fprintf(stderr, "failed to exec %s, %m\n", program);
-			exit(-1);
-		}
-	} else {
-		if (script && razor_write(fd[1], script, strlen(script)) < 0) {
-			fprintf(stderr, "failed to pipe script, %m\n");
-			return -1;
-		}
-		if (close(fd[0]) || close(fd[1])) {
-			fprintf(stderr, "failed to close pipe, %m\n");
-			return -1;
-		}
-		if (wait(&status) < 0) {
-			fprintf(stderr, "wait for child failed, %m");
-			return -1;
-		}
-		if (status)
-			printf("script exited with status %d\n", status);
-	}
-
-	return 0;
-}
-
-static int
-installer_init(struct installer *installer)
-{
-	unsigned char *gz_header;
-	int method, flags, err;
-
-	gz_header = installer->rpm->payload;
-	if (gz_header[0] != 0x1f || gz_header[1] != 0x8b) {
-		fprintf(stderr, "payload section doesn't have gz header\n");
-		return -1;
-	}
-
-	method = gz_header[2];
-	flags = gz_header[3];
-
-	if (method != Z_DEFLATED || flags != 0) {
-		fprintf(stderr,
-			"unknown payload compression method or flags set\n");
-		return -1;
-	}
-
-	installer->stream.zalloc = NULL;
-	installer->stream.zfree = NULL;
-	installer->stream.opaque = NULL;
-
-	installer->stream.next_in  = gz_header + 10;
-	installer->stream.avail_in =
-		(installer->rpm->map + installer->rpm->size) -
-		(void *) installer->stream.next_in;
-	installer->stream.next_out = NULL;
-	installer->stream.avail_out = 0;
-
-	err = inflateInit2(&installer->stream, -MAX_WBITS);
-	if (err != Z_OK) {
-		fprintf(stderr, "inflateInit error: %d\n", err);
-		return -1;
-	}
-
-	return 0;
-}
-
-static int
-installer_finish(struct installer *installer)
-{
-	int err;
-
-	err = inflateEnd(&installer->stream);
-
-	if (err != Z_OK) {
-		fprintf(stderr, "inflateEnd error: %d\n", err);
-		return -1;
-	}	    
-
-	return 0;
-}
-
-static unsigned long
-fixed_hex_to_ulong(const char *hex, int length)
-{
-	long l;
-	int i;
-
-	for (i = 0, l = 0; i < length; i++) {
-		if (hex[i] < 'a')
-			l = l * 16 + hex[i] - '0';
-		else
-			l = l * 16 + hex[i] - 'a' + 10;
-	}
-
-	return l;
-}
-
-int
-razor_rpm_install(struct razor_rpm *rpm, const char *root)
-{
-	struct installer installer;
-	struct cpio_file_header *header;
-	struct stat buf;
-	unsigned int mode;
-	char *path;
-	size_t filesize;
-
-	installer.rpm = rpm;
-	installer.root = root;
-
-	/* FIXME: Only do this before a transaction, not per rpm. */
-	if (stat(root, &buf) < 0 || !S_ISDIR(buf.st_mode)) {
-		fprintf(stderr,
-			"root installation directory \"%s\" does not exist\n",
-			root);
-		return -1;
-	}
-
-	if (installer_init(&installer))
-		return -1;
-
-	run_script(&installer, RPMTAG_PREINPROG, RPMTAG_PREIN);
-
-	while (installer.stream.avail_in > 0) {
-		installer.rest = sizeof *header;
-		if (installer_inflate(&installer))
-			return -1;
-		
-		header = (struct cpio_file_header *) installer.buffer;
-		mode = fixed_hex_to_ulong(header->mode, sizeof header->mode);
-		filesize = fixed_hex_to_ulong(header->filesize,
-					      sizeof header->filesize);
-
-		installer.rest = fixed_hex_to_ulong(header->namesize,
-						    sizeof header->namesize);
-
-		if (installer_inflate(&installer) ||
-		    installer_align(&installer, 4))
-			return -1;
-
-		path = (char *) installer.buffer;
-		/* This convention is so lame... */
-		if (strcmp(path, "TRAILER!!!") == 0)
-			break;
-
-		installer.rest = filesize;
-		if (create_path(&installer, path + 1, mode) < 0)
-			return -1;
-		if (installer_align(&installer, 4))
-			return -1;
-	}
-
-	if (installer_finish(&installer))
-		return -1;
-
-	run_script(&installer, RPMTAG_POSTINPROG, RPMTAG_POSTIN);
-
-	return 0;
-}
-
-int
-razor_rpm_close(struct razor_rpm *rpm)
-{
-	int err;
-
-	free(rpm->dirs);
-	err = munmap(rpm->map, rpm->size);
-	free(rpm);
-
-	return err;
-}
-
-int
-razor_importer_add_rpm(struct razor_importer *importer, struct razor_rpm *rpm)
-{
-	const char *name, *version, *release, *arch, *summary;
-	const uint_32 *epoch;
-	char evr[128], buf[16];
-
-	name = razor_rpm_get_indirect(rpm, RPMTAG_NAME, NULL);
-	epoch = razor_rpm_get_indirect(rpm, RPMTAG_EPOCH, NULL);
-	version = razor_rpm_get_indirect(rpm, RPMTAG_VERSION, NULL);
-	release = razor_rpm_get_indirect(rpm, RPMTAG_RELEASE, NULL);
-	arch = razor_rpm_get_indirect(rpm, RPMTAG_ARCH, NULL);
-	summary = razor_rpm_get_indirect(rpm, RPMTAG_SUMMARY, NULL);
-
-	if (epoch) {
-		snprintf(buf, sizeof buf, "%u", ntohl(*epoch));
-		razor_build_evr(evr, sizeof evr, buf, version, release);
-	} else {
-		razor_build_evr(evr, sizeof evr, NULL, version, release);
-	}
-	razor_importer_begin_package(importer, name, evr, arch);
-
-	import_properties(importer, RAZOR_PROPERTY_REQUIRES, rpm,
-			  RPMTAG_REQUIRENAME,
-			  RPMTAG_REQUIREVERSION,
-			  RPMTAG_REQUIREFLAGS);
-
-	import_properties(importer, RAZOR_PROPERTY_PROVIDES, rpm,
-			  RPMTAG_PROVIDENAME,
-			  RPMTAG_PROVIDEVERSION,
-			  RPMTAG_PROVIDEFLAGS);
-
-	import_properties(importer, RAZOR_PROPERTY_OBSOLETES, rpm,
-			  RPMTAG_OBSOLETENAME,
-			  RPMTAG_OBSOLETEVERSION,
-			  RPMTAG_OBSOLETEFLAGS);
-
-	import_properties(importer, RAZOR_PROPERTY_CONFLICTS, rpm,
-			  RPMTAG_CONFLICTNAME,
-			  RPMTAG_CONFLICTVERSION,
-			  RPMTAG_CONFLICTFLAGS);
-
-	import_files(importer, rpm);
-
-	razor_importer_finish_package(importer);
-
-	return 0;
-}
-
-union rpm_entry {
-	void *p;
-	char *string;
-	char **list;
-	uint_32 *flags;
-	uint_32 integer;
-};
-
-static void
-add_properties(struct razor_importer *importer,
-	       enum razor_property_type property_type,
-	       Header h, int_32 name_tag, int_32 version_tag, int_32 flags_tag)
-{
-	union rpm_entry names, versions, flags;
-	int_32 i, type, count;
-
-	headerGetEntry(h, name_tag, &type, &names.p, &count);
-	headerGetEntry(h, version_tag, &type, &versions.p, &count);
-	headerGetEntry(h, flags_tag, &type, &flags.p, &count);
-
-	for (i = 0; i < count; i++)
-		razor_importer_add_property(importer,
-					    names.list[i],
-					    rpm_to_razor_flags (flags.flags[i]),
-					    versions.list[i],
-					    property_type);
-}
-
-struct razor_set *
-razor_set_create_from_rpmdb(void)
-{
-	struct razor_importer *importer;
-	rpmdbMatchIterator iter;
-	Header h;
-	int_32 type, count, i;
-	union rpm_entry name, epoch, version, release, arch;
-	union rpm_entry summary, description, url, license;
-	union rpm_entry basenames, dirnames, dirindexes;
-	char filename[PATH_MAX], evr[128], buf[16];
-	rpmdb db;
-
-	rpmReadConfigFiles(NULL, NULL);
-
-	if (rpmdbOpen("", &db, O_RDONLY, 0644) != 0) {
-		fprintf(stderr, "cannot open rpm database\n");
-		exit(1);
-	}
-
-	importer = razor_importer_new();
-
-	iter = rpmdbInitIterator(db, 0, NULL, 0);
-	while (h = rpmdbNextIterator(iter), h != NULL) {
-		headerGetEntry(h, RPMTAG_NAME, &type, &name.p, &count);
-		headerGetEntry(h, RPMTAG_EPOCH, &type, &epoch.p, &count);
-		headerGetEntry(h, RPMTAG_VERSION, &type, &version.p, &count);
-		headerGetEntry(h, RPMTAG_RELEASE, &type, &release.p, &count);
-		headerGetEntry(h, RPMTAG_ARCH, &type, &arch.p, &count);
-		headerGetEntry(h, RPMTAG_SUMMARY, &type, &summary.p, &count);
-		headerGetEntry(h, RPMTAG_DESCRIPTION, &type, &description.p, &count);
-		headerGetEntry(h, RPMTAG_URL, &type, &url.p, &count);
-		headerGetEntry(h, RPMTAG_LICENSE, &type, &license.p, &count);
-
-		if (epoch.flags != NULL) {
-			snprintf(buf, sizeof buf, "%u", *epoch.flags);
-			razor_build_evr(evr, sizeof evr,
-					buf, version.string, release.string);
-		} else {
-			razor_build_evr(evr, sizeof evr,
-					NULL, version.string, release.string);
-		}
-
-		razor_importer_begin_package(importer,
-					     name.string, evr, arch.string);
-		razor_importer_add_details(importer, summary.string,
-					   description.string, url.string,
-					   license.string);
-
-		add_properties(importer, RAZOR_PROPERTY_REQUIRES, h,
-			       RPMTAG_REQUIRENAME,
-			       RPMTAG_REQUIREVERSION,
-			       RPMTAG_REQUIREFLAGS);
-
-		add_properties(importer, RAZOR_PROPERTY_PROVIDES, h,
-			       RPMTAG_PROVIDENAME,
-			       RPMTAG_PROVIDEVERSION,
-			       RPMTAG_PROVIDEFLAGS);
-
-		add_properties(importer, RAZOR_PROPERTY_OBSOLETES, h,
-			       RPMTAG_OBSOLETENAME,
-			       RPMTAG_OBSOLETEVERSION,
-			       RPMTAG_OBSOLETEFLAGS);
-
-		add_properties(importer, RAZOR_PROPERTY_CONFLICTS, h,
-			       RPMTAG_CONFLICTNAME,
-			       RPMTAG_CONFLICTVERSION,
-			       RPMTAG_CONFLICTFLAGS);
-
-		headerGetEntry(h, RPMTAG_BASENAMES, &type,
-			       &basenames.p, &count);
-		headerGetEntry(h, RPMTAG_DIRNAMES, &type,
-			       &dirnames.p, &count);
-		headerGetEntry(h, RPMTAG_DIRINDEXES, &type,
-			       &dirindexes.p, &count);
-		for (i = 0; i < count; i++) {
-			snprintf(filename, sizeof filename, "%s%s",
-				 dirnames.list[dirindexes.flags[i]],
-				 basenames.list[i]);
-			razor_importer_add_file(importer, filename);
-		}
-
-		razor_importer_finish_package(importer);
-	}
-
-	rpmdbClose(db);
-
-	return razor_importer_finish(importer);
-}