On Sat, Mar 09, 2013 at 06:05:28PM +1000, Allan McRae wrote: > On 09/03/13 07:34, William Giokas wrote: > > Previously makepkg would clone vcs sources in the download function, > > regardless of the noextract settings. Now the download_* functions only > > download or update the vcs sources, and the new extract_* functions just > > create working copies using the specified protocols. The extract_sources > > function will call the needed extract function for the protocol > > specified. The tarball extraction has also been moved into its own > > extract_file function to keep things consistent. > > > > Signed-off-by: William Giokas <[email protected]> > > --- > > > > Oops. Forgot to delete that function. Thanks for the catch. > > > > scripts/makepkg.sh.in | 205 > > +++++++++++++++++++++++++++++++++----------------- > > 1 file changed, 137 insertions(+), 68 deletions(-) > > > > One more thing.... > > > <snip> > > > > @@ -1224,6 +1314,12 @@ check_source_integrity() { > > > > extract_sources() { > > msg "$(gettext "Extracting sources...")" > > + > > + local GET_VCS=1 > > + if [[ $1 == "fast" ]]; then > > + GET_VCS=0 > > + fi > > + > > local netfile > > for netfile in "${source[@]}"; do > > local file=$(get_filename "$netfile") > > <snip> > > > + if (( PKGVERFUNC && GET_VCS )); then > > + update_pkgver > > + check_pkgver || exit 1 > > + check_build_status > > fi > > There is no "extract_sources fast" so this is wrong... I'd guess where > it is now, the pkgver update should just be "if (( PKGVERFUNC ))". The > first sections setting GET_VCS can be removed. > > Allan
Alright, I'll send that when I wake up. -- William Giokas | KaiSforza GnuPG Key: 0x73CD09CF Fingerprint: F73F 50EF BBE2 9846 8306 E6B8 6902 06D8 73CD 09CF
pgpa333Rdlcq4.pgp
Description: PGP signature
