On 02/05/13 15:29, William Giokas wrote:
On Thu, May 02, 2013 at 01:56:18PM +1000, Allan McRae wrote:
On 02/05/13 13:44, William Giokas wrote:
This should fix both the `use -f to override` and the dependency checking.
Signed-off-by: William Giokas <1007380@gmail.com> --- scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index edfca3c..9159b2c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2836,7 +2836,7 @@ if { [[ -z $SIGNPKG ]] && check_buildenv "sign" "y"; } || [[ $SIGNPKG == 'y' ]]; fi fi
-if (( ! PKGVERFUNC )); then +if (( ! PKGVERFUNC && ! VERIFYSOURCE )); then check_build_status fi
Fine.
@@ -2915,7 +2915,7 @@ if (( SOURCEONLY )); then exit 0 fi
-if (( NODEPS || (NOBUILD && !DEP_BIN ) )); then +if (( VERIFYSOURCE || NODEPS || (NOBUILD && !DEP_BIN ) )); then # no warning message needed for nobuild if (( NODEPS )); then warning "$(gettext "Skipping dependency checks.")"
I have been thinking about this... Your VCS tool will be in makedepends and needed to download those sources.
This is another issue. When --verifysource is run, download_sources should take the `fast` option to skip vcs sources. I'll work on that now, actually.
If that is the case, then VERFIYSOURCE should just occur at the same place as GENINTEG and they can share the download. But look back a the discussion when we added this. I seem to recall we discussed that...