diff options
| author | Xavier Chantry <shiningxc@gmail.com> | 2009-08-08 19:59:02 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-08-19 03:47:12 +0200 |
| commit | 7dae79e7b95c517df136003728363dc9ad346a7e (patch) | |
| tree | 18796043b6cdbfdf27a5ce801d7cdd8d76c798b3 /src | |
| parent | 7bb9c4098b29d7bcc82ff9e9a823d2adc44cc881 (diff) | |
| download | pacman-7dae79e7b95c517df136003728363dc9ad346a7e.tar.gz pacman-7dae79e7b95c517df136003728363dc9ad346a7e.tar.xz | |
dload.c : various fixes
- fix one memleak if get_filename failed
- cleanup according to Joerg's feedback:
"url_for_string: If fetchParseURL returned successful, you should always
have a scheme set. The logic for anonftp should only be needed for very
broken server -- do you know of any such?
download_internal:
Specifying 'p' is now a nop -- it is tried by default first with
fall-back to active FTP."
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
[Dan: remove from pacman.conf and pacman.conf.5]
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/pacman.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 77c558d1..25647b5e 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -787,10 +787,7 @@ static int _parseconfig(const char *file, const char *givensection, } if(ptr == NULL && strcmp(section, "options") == 0) { /* directives without settings, all in [options] */ - if(strcmp(key, "NoPassiveFtp") == 0) { - alpm_option_set_nopassiveftp(1); - pm_printf(PM_LOG_DEBUG, "config: nopassiveftp\n"); - } else if(strcmp(key, "UseSyslog") == 0) { + if(strcmp(key, "UseSyslog") == 0) { alpm_option_set_usesyslog(1); pm_printf(PM_LOG_DEBUG, "config: usesyslog\n"); } else if(strcmp(key, "ILoveCandy") == 0) { |