Mercurial > mxe-octave

annotate src/of-queueing-1-octave7.patch @ 6161:8fcac4d6d983 release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-queueing: Fix syntax error with Octave 7 (bug #62314). * src/of-queueing-1-octave7.patch: Add new file. * dist-files.mk: Include new patch.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 14 Apr 2022 19:27:13 +0200
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6161
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 Description: Fix FTBFS against Octave 7
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 print_usage() was called within a logical expression. Since it does not return
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 a value, this fails with Octave 7 since the latter does stricter checks on
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 number of output arguments.
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5 This patch uses an if/endif conditional rather than a logical short-circuit
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 expression.
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 Author: Sébastien Villemot <sebastien@debian.org>
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 Bug: https://savannah.gnu.org/bugs/?62314
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 Bug-Debian: https://bugs.debian.org/1009135
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 Last-Update: 2022-04-14
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 ---
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 --- a/inst/qnmknode.m
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 +++ b/inst/qnmknode.m
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 @@ -126,22 +126,25 @@ function Q = qnmknode( node, S, varargin
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 endif
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17 elseif ( strcmp(node, "-/g/1-lcfs-pr") )
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 ## -/G/1-LCFS-PR node
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 - ( 2 == nargin || 3 == nargin ) || ...
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 - print_usage();
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 + if ~( 2 == nargin || 3 == nargin )
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 + print_usage();
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 + endif
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24 if ( 3 == nargin )
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 s2 = varargin{1};
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26 endif
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27 elseif ( strcmp(node, "-/g/1-ps") )
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28 ## -/G/1-PS (processor sharing) node
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29 - ( 2 == nargin || 3 == nargin ) || ...
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30 - print_usage();
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
31 + if ~( 2 == nargin || 3 == nargin )
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
32 + print_usage();
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
33 + endif
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
34 if ( 3 == nargin )
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
35 s2 = varargin{1};
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
36 endif
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
37 elseif ( strcmp(node, "-/g/inf") )
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
38 ## -/G/inf (Infinite Server) node
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
39 - ( 2 == nargin || 3 == nargin ) || ...
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
40 - print_usage();
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
41 + if ~( 2 == nargin || 3 == nargin )
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
42 + print_usage();
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
43 + endif
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
44 if ( 3 == nargin )
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
45 s2 = varargin{1};
8fcac4d6d983 of-queueing: Fix syntax error with Octave 7 (bug #62314).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
46 endif