projects
/
project
/
opkg-lede.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix opkg_re_read_config_files().
[project/opkg-lede.git]
/
libopkg
/
opkg.c
diff --git
a/libopkg/opkg.c
b/libopkg/opkg.c
index 574386e97c3023ac7ec90d9600ed755f62fa4cc2..075737075104d10c136daf3add7745b7e39c5a3c 100644
(file)
--- a/
libopkg/opkg.c
+++ b/
libopkg/opkg.c
@@
-112,11
+112,14
@@
curl_progress_cb(struct _curl_cb_data *cb_data, double t, /* dltotal */
}
}
+static struct opkg_conf saved_conf;
/*** Public API ***/
int
opkg_new()
{
/*** Public API ***/
int
opkg_new()
{
+ saved_conf = *conf;
+
if (opkg_conf_init())
goto err0;
if (opkg_conf_init())
goto err0;
@@
-150,20
+153,9
@@
opkg_free(void)
int
opkg_re_read_config_files(void)
{
int
opkg_re_read_config_files(void)
{
- pkg_hash_deinit();
- pkg_hash_init();
-
- if (pkg_hash_load_feeds())
- goto err;
-
- if (pkg_hash_load_status_files())
- goto err;
-
- return 0;
-
-err:
- pkg_hash_deinit();
- return -1;
+ opkg_free();
+ *conf = saved_conf;
+ return opkg_new();
}
void
}
void