#include "repo_write.h"
#include "common_write.h"
+#define LIBSOLV_TOOLVERSION "1.0"
+
static Id verticals[] = {
SOLVABLE_AUTHORS,
SOLVABLE_DESCRIPTION,
SOLVABLE_EULA,
SOLVABLE_DISKUSAGE,
SOLVABLE_FILELIST,
+ SOLVABLE_CHANGELOG_AUTHOR,
+ SOLVABLE_CHANGELOG_TEXT,
0
};
for (i = 0; verticals[i]; i++)
if (key->name == verticals[i])
return KEY_STORAGE_VERTICAL_OFFSET;
- keyname = id2str(data->pool, key->name);
+ keyname = pool_id2str(data->pool, key->name);
for (i = 0; languagetags[i] != 0; i++)
if (!strncmp(keyname, languagetags[i], strlen(languagetags[i])))
return KEY_STORAGE_VERTICAL_OFFSET;
const char *keyname;
if (key->storage == KEY_STORAGE_SOLVABLE)
return KEY_STORAGE_DROPPED;
- /* those two must only be in the main solv file */
- if (key->name == REPOSITORY_EXTERNAL || key->name == REPOSITORY_ADDEDFILEPROVIDES)
+ /* those must only be in the main solv file */
+ if (key->name == REPOSITORY_EXTERNAL || key->name == REPOSITORY_ADDEDFILEPROVIDES || key->name == REPOSITORY_TOOLVERSION)
return KEY_STORAGE_DROPPED;
for (i = 0; verticals[i]; i++)
if (key->name == verticals[i])
return KEY_STORAGE_VERTICAL_OFFSET;
- keyname = id2str(data->pool, key->name);
+ keyname = pool_id2str(data->pool, key->name);
for (i = 0; languagetags[i] != 0; i++)
if (!strncmp(keyname, languagetags[i], strlen(languagetags[i])))
return KEY_STORAGE_VERTICAL_OFFSET;
static int
keyfilter_language(Repo *repo, Repokey *key, void *kfdata)
{
+ Pool *pool = repo->pool;
const char *name, *p;
- char *lang = kfdata, *bname;
+ char *lang = kfdata;
int i;
- Id id;
- name = id2str(repo->pool, key->name);
+ name = pool_id2str(repo->pool, key->name);
p = strrchr(name, ':');
if (!p || strcmp(p + 1, lang) != 0)
return KEY_STORAGE_DROPPED;
- /* find base name id */
- bname = strdup(name);
- bname[p - name] = 0;
- id = str2id(repo->pool, bname, 1);
for (i = 0; verticals[i]; i++)
- if (id == verticals[i])
- return KEY_STORAGE_VERTICAL_OFFSET;
+ {
+ const char *vname = pool_id2str(pool, verticals[i]);
+ if (!strncmp(name, vname, p - name) && vname[p - name] == 0)
+ return KEY_STORAGE_VERTICAL_OFFSET;
+ }
return KEY_STORAGE_INCORE;
}
if (key->name == SOLVABLE_FILELIST || key->name == SOLVABLE_DISKUSAGE)
return KEY_STORAGE_DROPPED;
- name = id2str(repo->pool, key->name);
+ name = pool_id2str(repo->pool, key->name);
p = strrchr(name, ':');
if (p)
{
static void
write_info(Repo *repo, FILE *fp, int (*keyfilter)(Repo *repo, Repokey *key, void *kfdata), void *kfdata, Repodata *info, const char *location)
{
- Id h, *keyarray = 0;
- int i;
+ Id h;
+ Queue keyq;
- repo_write(repo, fp, keyfilter, kfdata, &keyarray);
- h = repodata_new_handle(info);
- if (keyarray)
+ queue_init(&keyq);
+ if (repo_write_filtered(repo, fp, keyfilter, kfdata, &keyq) != 0)
{
- for (i = 0; keyarray[i]; i++)
- repodata_add_idarray(info, h, REPOSITORY_KEYS, keyarray[i]);
+ fprintf(stderr, "repo_write failed\n");
+ exit(1);
}
- sat_free(keyarray);
+ h = repodata_new_handle(info);
+ if (keyq.count)
+ repodata_set_idarray(info, h, REPOSITORY_KEYS, &keyq);
+ queue_free(&keyq);
repodata_set_str(info, h, REPOSITORY_LOCATION, location);
- repodata_add_flexarray(info, REPOENTRY_META, REPOSITORY_EXTERNAL, h);
+ repodata_add_flexarray(info, SOLVID_META, REPOSITORY_EXTERNAL, h);
}
-int
+void
tool_write(Repo *repo, const char *basename, const char *attrname)
{
Repodata *data;
char **languages = 0;
int nlanguages = 0;
int i, j, k, l;
- Id *addedfileprovides = 0;
struct keyfilter_data kd;
+ Queue addedfileprovides;
memset(&kd, 0, sizeof(kd));
info = repo_add_repodata(repo, 0);
- pool_addfileprovides_ids(repo->pool, 0, &addedfileprovides);
- if (addedfileprovides && *addedfileprovides)
+ repodata_set_str(info, SOLVID_META, REPOSITORY_TOOLVERSION, LIBSOLV_TOOLVERSION);
+ queue_init(&addedfileprovides);
+ pool_addfileprovides_queue(repo->pool, &addedfileprovides, 0);
+ if (addedfileprovides.count)
{
kd.haveaddedfileprovides = 1;
- for (i = 0; addedfileprovides[i]; i++)
- repodata_add_idarray(info, REPOENTRY_META, REPOSITORY_ADDEDFILEPROVIDES, addedfileprovides[i]);
+ repodata_set_idarray(info, SOLVID_META, REPOSITORY_ADDEDFILEPROVIDES, &addedfileprovides);
}
- sat_free(addedfileprovides);
+ queue_free(&addedfileprovides);
+
+ pool_freeidhashes(repo->pool); /* free some mem */
if (basename)
{
int has_FL = 0;
/* find languages and other info */
- for (i = 0, data = repo->repodata; i < repo->nrepodata; i++, data++)
+ FOR_REPODATAS(repo, i, data)
{
for (j = 1, key = data->keys + j; j < data->nkeys; j++, key++)
{
- const char *keyname = id2str(repo->pool, key->name);
+ const char *keyname = pool_id2str(repo->pool, key->name);
if (key->name == SOLVABLE_DISKUSAGE)
has_DU = 1;
if (key->name == SOLVABLE_FILELIST)
break;
if (k < nlanguages)
continue;
- languages = sat_realloc2(languages, nlanguages + 1, sizeof(char *));
+ languages = solv_realloc2(languages, nlanguages + 1, sizeof(char *));
languages[nlanguages++] = strdup(keyname + l);
}
}
kd.languages = languages;
kd.nlanguages = nlanguages;
repodata_internalize(info);
- repo_write(repo, fp, keyfilter_other, &kd, 0);
- fclose(fp);
+ if (repo_write_filtered(repo, fp, keyfilter_other, &kd, 0) != 0)
+ {
+ fprintf(stderr, "repo_write failed\n");
+ exit(1);
+ }
+ if (fclose(fp) != 0)
+ {
+ perror("fclose");
+ exit(1);
+ }
for (i = 0; i < nlanguages; i++)
free(languages[i]);
- sat_free(languages);
+ solv_free(languages);
repodata_free(info);
- repo->nrepodata--;
- return 0;
}
if (attrname)
{
+ FILE *fp;
test_separate = 1;
- FILE *fp = fopen(attrname, "w");
+ fp = fopen(attrname, "w");
write_info(repo, fp, keyfilter_attr, 0, info, attrname);
fclose(fp);
kd.haveexternal = 1;
}
repodata_internalize(info);
- repo_write(repo, stdout, keyfilter_solv, &kd, 0);
+ if (repo_write_filtered(repo, stdout, keyfilter_solv, &kd, 0) != 0)
+ {
+ fprintf(stderr, "repo_write failed\n");
+ exit(1);
+ }
repodata_free(info);
- repo->nrepodata--;
- return 0;
}