diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-02-01 13:31:37 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-02-01 13:41:25 +0100 |
| commit | ddd386157cf718382670e4adbcfc44029240e33f (patch) | |
| tree | 0841639124026772a31525fef07ea0951651f574 | |
| parent | 02f9400f8a46b6fa3ea50aa8ef8eb60d5f9a833d (diff) | |
| download | aports-ddd386157cf718382670e4adbcfc44029240e33f.tar.bz2 aports-ddd386157cf718382670e4adbcfc44029240e33f.tar.xz | |
db: fix bug with --repository
The 'r' variable is overwritten and no longer holds the repository
number.
| -rw-r--r-- | src/database.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/database.c b/src/database.c index e2961dfc71..0fe17fe983 100644 --- a/src/database.c +++ b/src/database.c @@ -1762,7 +1762,7 @@ int apk_db_add_repository(apk_database_t _db, apk_blob_t _repository) struct apk_bstream *bs = NULL; struct apk_repository *repo; apk_blob_t brepo, btag; - int r, targz = 1, tag_id = 0; + int repo_num, r, targz = 1, tag_id = 0; char buf[PATH_MAX]; if (db->num_repos >= APK_MAX_REPOS) @@ -1780,8 +1780,8 @@ int apk_db_add_repository(apk_database_t _db, apk_blob_t _repository) tag_id = apk_db_get_tag_id(db, btag); } - r = db->num_repos++; - repo = &db->repos[r]; + repo_num = db->num_repos++; + repo = &db->repos[repo_num]; *repo = (struct apk_repository) { .url = apk_blob_cstr(brepo), }; @@ -1795,20 +1795,20 @@ int apk_db_add_repository(apk_database_t _db, apk_blob_t _repository) apk_cache_format_index(APK_BLOB_BUF(buf), repo); bs = apk_bstream_from_file(db->cache_fd, buf); } else { - db->local_repos |= BIT(r); + db->local_repos |= BIT(repo_num); bs = apk_repo_file_open(repo, db->arch, apkindex_tar_gz, buf, sizeof(buf)); } - if (bs != NULL) - r = load_index(db, bs, targz, r); - else + if (bs != NULL) { + r = load_index(db, bs, targz, repo_num); + } else r = -ENOENT; if (r != 0) { apk_warning("Ignoring %s: %s", buf, apk_error_str(r)); - db->bad_repos |= BIT(r); + db->bad_repos |= BIT(repo_num); r = 0; } else { - db->repo_tags[tag_id].allowed_repos |= BIT(r); + db->repo_tags[tag_id].allowed_repos |= BIT(repo_num); } return 0; |