Skip to content

Commit 523f04c

Browse files
committed
---
yaml --- r: 189194 b: refs/heads/snap-stage3 c: 7ed4660 h: refs/heads/master v: v3
1 parent 9ebd44e commit 523f04c

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 4d716decb5d9944bc0d79cdc51b03e3af69bc59c
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 61c6b199bcc23fe931f3fda2f968442256e07dab
4+
refs/heads/snap-stage3: 7ed4660a51b048f8b166b298d1777544d3a0fd98
55
refs/heads/try: 649d35e4d830b27806705dc5352c86ab6d6fd1a1
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/configure

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -697,15 +697,17 @@ probe CFG_ADB adb
697697

698698
if [ ! -z "$CFG_PANDOC" ]
699699
then
700-
PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc\(.exe\)\? ' |
701-
# extract the first 2 version fields, ignore everything else
702-
sed 's/pandoc\(.exe\)\? \([0-9]*\)\.\([0-9]*\).*/\2 \3/')
700+
PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc' |
701+
# Extract "MAJOR MINOR" from Pandoc's version number
702+
sed -E 's/pandoc(.exe)? ([0-9]+)\.([0-9]+).*/\2 \3/')
703703

704704
MIN_PV_MAJOR="1"
705705
MIN_PV_MINOR="9"
706+
706707
# these patterns are shell globs, *not* regexps
707708
PV_MAJOR=${PV_MAJOR_MINOR% *}
708709
PV_MINOR=${PV_MAJOR_MINOR#* }
710+
709711
if [ "$PV_MAJOR" -lt "$MIN_PV_MAJOR" ] || [ "$PV_MINOR" -lt "$MIN_PV_MINOR" ]
710712
then
711713
step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. Need at least $MIN_PV_MAJOR.$MIN_PV_MINOR. Disabling"

0 commit comments

Comments
 (0)