[backfire] merge r23029, r23030, r23031 and r23032
[openwrt-10.03/.git] / package / opkg / patches / 011-old-config-location.patch
1 --- a/src/opkg-cl.c
2 +++ b/src/opkg-cl.c
3 @@ -172,7 +172,10 @@ args_parse(int argc, char *argv[])
4                         printf("Confusion: getopt_long returned %d\n", c);
5                 }
6         }
7 -    
8 +
9 +       if(!conf->conf_file && !conf->offline_root)
10 +               conf->conf_file = xstrdup("/etc/opkg.conf");
11 +
12         if (parse_err)
13                 return parse_err;
14         else