diff options
| author | Aurelien Foret <aurelien@archlinux.org> | 2006-03-04 16:33:44 +0100 |
|---|---|---|
| committer | Aurelien Foret <aurelien@archlinux.org> | 2006-03-04 16:33:44 +0100 |
| commit | 1bd8f57a183db0b9be503eeff3027c4b8d65627d (patch) | |
| tree | 0ef7184196f10b36a281fff8ae969db7fa1ba395 /src | |
| parent | 297c5284b6364c94c2ea2b8911a912a3bfa2ce1e (diff) | |
| download | pacman-1bd8f57a183db0b9be503eeff3027c4b8d65627d.tar.gz pacman-1bd8f57a183db0b9be503eeff3027c4b8d65627d.tar.xz | |
- changed flags type from char to int
- downloadonly implies FLAG_NOCONFLICTS
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/conf.h | 2 | ||||
| -rw-r--r-- | src/pacman/pacman.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/pacman/conf.h b/src/pacman/conf.h index fdd4b20a..319c75f8 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -52,7 +52,7 @@ typedef struct __config_t { unsigned short op_s_search; unsigned short op_s_upgrade; unsigned short group; - unsigned char flags; + unsigned int flags; unsigned short debug; /* configuration file option */ char *proxyhost; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 18422e39..3d62ee69 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -394,7 +394,10 @@ int parseargs(int argc, char *argv[]) break; case 'u': config->op_s_upgrade = 1; break; case 'v': config->verbose++; break; - case 'w': config->op_s_downloadonly = 1; break; + case 'w': + config->op_s_downloadonly = 1; + config->flags |= PM_TRANS_FLAG_NOCONFLICTS; + break; case 'y': config->op_s_sync++; break; case '?': return(1); default: return(1); |