Skip to content

Commit 94df5d6

Browse files
committed
repo_rpmdb.c: move "Packages" string into backend implementations
Other rpm database implementations like "ndb" use different names.
1 parent ee27eee commit 94df5d6

3 files changed

Lines changed: 13 additions & 7 deletions

File tree

ext/repo_rpmdb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1605,7 +1605,7 @@ repo_add_rpmdb(Repo *repo, Repo *ref, int flags)
16051605
}
16061606

16071607
/* XXX: should get ro lock of Packages database! */
1608-
if (stat_database(&state, "Packages", &packagesstat, 1))
1608+
if (stat_database(&state, &packagesstat))
16091609
{
16101610
freestate(&state);
16111611
return -1;

ext/repo_rpmdb_bdb.h

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ struct rpmdbstate {
5757

5858

5959
static int
60-
stat_database(struct rpmdbstate *state, char *dbname, struct stat *statbuf, int seterror)
60+
stat_database_name(struct rpmdbstate *state, char *dbname, struct stat *statbuf, int seterror)
6161
{
6262
char *dbpath;
6363
dbpath = solv_dupjoin(state->rootdir, state->is_ostree ? "/usr/share/rpm/" : "/var/lib/rpm/", dbname);
@@ -72,6 +72,13 @@ stat_database(struct rpmdbstate *state, char *dbname, struct stat *statbuf, int
7272
return 0;
7373
}
7474

75+
static int
76+
stat_database(struct rpmdbstate *state, struct stat *statbuf)
77+
{
78+
return stat_database_name(state, "Packages", statbuf, 1);
79+
}
80+
81+
7582
static inline Id
7683
db2rpmdbid(unsigned char *db, int byteswapped)
7784
{
@@ -426,7 +433,7 @@ count_headers(struct rpmdbstate *state)
426433
DBT dbkey;
427434
DBT dbdata;
428435

429-
if (stat_database(state, "Name", &statbuf, 0))
436+
if (stat_database_name(state, "Name", &statbuf, 0))
430437
return 0;
431438
memset(&dbkey, 0, sizeof(dbkey));
432439
memset(&dbdata, 0, sizeof(dbdata));

ext/repo_rpmdb_librpm.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,13 @@ struct rpmdbstate {
3131
};
3232

3333
static int
34-
stat_database(struct rpmdbstate *state, char *dbname, struct stat *statbuf, int seterror)
34+
stat_database(struct rpmdbstate *state, struct stat *statbuf)
3535
{
3636
char *dbpath;
37-
dbpath = solv_dupjoin(state->rootdir, state->is_ostree ? "/usr/share/rpm/" : "/var/lib/rpm/", dbname);
37+
dbpath = solv_dupjoin(state->rootdir, state->is_ostree ? "/usr/share/rpm/" : "/var/lib/rpm/", "Packages");
3838
if (stat(dbpath, statbuf))
3939
{
40-
if (seterror)
41-
pool_error(state->pool, -1, "%s: %s", dbpath, strerror(errno));
40+
pool_error(state->pool, -1, "%s: %s", dbpath, strerror(errno));
4241
free(dbpath);
4342
return -1;
4443
}

0 commit comments

Comments
 (0)