diff options
| author | Nezmer <git@nezmer.info> | 2010-05-17 10:52:38 -0400 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-05-18 11:31:59 -0500 |
| commit | c6f0fc27eda31943e10e2a89e221796efb87dce9 (patch) | |
| tree | 5e3e4300c1ca3f1be8d516a19ef461ba3a98e0c9 | |
| parent | d44e5099339616c29797b88ed19fe27ea282c9ae (diff) | |
Resolve dependencies whenever --syncdeps is passed and --nodeps is not
With this patch, dependencies will be resolved and not silently ignored
when running:
makepkg --nobuild --syncdeps
makepkg --repackage --syncdeps
Also, a warning is displayed when repackaging and dependencies are not
being resolved.
Thank you Allan for the feedback.
Signed-off-by: Nezmer <git@nezmer.info>
[Allan: Only warn when repackaging with a package function]
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 97418796..30e365c0 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1910,9 +1910,9 @@ if (( SOURCEONLY )); then exit 0 fi -if (( NODEPS || NOBUILD || REPKG )); then +if (( NODEPS || ( (NOBUILD || REPKG) && !DEP_BIN ) )); then # no warning message needed for nobuild, repkg - if (( NODEPS )); then + if (( NODEPS || ( REPKG && PKGFUNC ) )); then warning "$(gettext "Skipping dependency checks.")" fi elif [ $(type -p "${PACMAN%% *}") ]; then |