On 18/05/10 00:52, Nezmer wrote:
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<[email protected]>

Looks good.   I made a small change below and pushed to my working branch.

---
  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 a2db90b..f57e066 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1867,9 +1867,9 @@ if (( SOURCEONLY )); then
  fi

  # fix flyspray bug #5973
-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 )); then

Changed this to "if (( NODEPS || ( REPKG && PKGFUNC ) ))" as dependencies are only ever needed for repackaging there is a package() function.

                warning "$(gettext "Skipping dependency checks.")"
        fi
  elif [ $(type -p "${PACMAN%% *}") ]; then


Reply via email to