| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | src/pacman/conf.h | 2 | ||||
| -rw-r--r-- | src/pacman/pacman.c | 5 |
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); |