1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
From ddd386157cf718382670e4adbcfc44029240e33f Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 1 Feb 2012 13:31:37 +0100
Subject: [PATCH] db: fix bug with --repository
The 'r' variable is overwritten and no longer holds the repository
number.
---
src/database.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/database.c b/src/database.c
index e2961df..0fe17fe 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;
--
1.7.9
|
