[Pkg-octave-devel] [Pkg-octave-commit] [octave-pkg-dev] 03/04: Stop using "pkg load all", which was dropped in Octave 4.2.
Rafael Laboissière
rafael at debian.org
Mon Jul 10 16:33:43 UTC 2017
Grrr…
I did this change on June 24 (cf attached patch) and forgot to push it!
My implementation used cellfun instead of a for loop.
Rafael
* Sébastien Villemot <sebastien at debian.org> [2017-07-10 13:33]:
> This is an automated email from the git hooks/post-receive script.
>
> sebastien pushed a commit to branch master
> in repository octave-pkg-dev.
>
> commit 720637641e49b624d3ad363f483549ce1954eed3
> Author: Sébastien Villemot <sebastien at debian.org>
> Date: Mon Jul 10 15:25:13 2017 +0200
>
> Stop using "pkg load all", which was dropped in Octave 4.2.
>
> Replace it by a manual loading of all system packages returned by "pkg list".
>
> Closes: #867154
> Gbp-Dch: Full
> ---
> check-pkg | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/check-pkg b/check-pkg
> index c7d17a4..98d5065 100755
> --- a/check-pkg
> +++ b/check-pkg
> @@ -10,7 +10,7 @@ unit_test_regex='^%!\(assert\|test\|error\|fail\|xtest\|warning\)'
> echo Checking m files ...
> tmp=$(tempfile)
> echo "addpath (genpath ([pwd(),'/debian']));" > $tmp
> -echo "pkg load all;" >> $tmp
> +echo "[usr_pkg,sys_pkg]=pkg('list'); for i = 1:length(sys_pkg); pkg('load',sys_pkg{1,i}.name); endfor;" >> $tmp
> for f in $(find debian/ -name \*.m $excluded_files_expr | grep -v /private/) ; do
> if grep -q "$unit_test_regex" $f ; then
> stem=$(echo $f | sed 's:[^@]*/::;s/\.m$//')
> @@ -32,7 +32,7 @@ rm -f $tmp
> echo Checking CC files ...
> tmp=$(tempfile)
> echo "addpath (genpath ([pwd()], '.pc'));" >> $tmp
> -echo "pkg load all;" >> $tmp
> +echo "[usr_pkg,sys_pkg]=pkg('list'); for i = 1:length(sys_pkg); pkg('load',sys_pkg{1,i}.name); endfor;" >> $tmp
> echo "warning ('off', 'Octave:autoload-relative-file-name');" >> $tmp
> if [ -f PKG_ADD ] ; then
> echo "source('PKG_ADD');" >> $tmp
> @@ -56,7 +56,10 @@ rm -f $tmp
> if [ -f debian/check.m ] ; then
> $OCTPKG_TEST_ENV $octave $octave_options --eval \
> "addpath (genpath ([pwd(),'/debian'])); \
> - pkg load all; \
> + [usr_pkg, sys_pkg] = pkg('list'); \
> + for i = 1:length(sys_pkg); \
> + pkg('load', sys_pkg{1,i}.name); \
> + endfor; \
> source ('debian/check.m');"
> fi
>
>
> --
> Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-pkg-dev.git
>
> _______________________________________________
> Pkg-octave-commit mailing list
> Pkg-octave-commit at lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-octave-commit
-------------- next part --------------
A non-text attachment was scrubbed...
Name: d4fcf8f.patch
Type: text/x-diff
Size: 1574 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-octave-devel/attachments/20170710/90a283e2/attachment-0001.patch>
More information about the Pkg-octave-devel
mailing list