Skip to content

Commit 968bb57

Browse files
committed
---
yaml --- r: 50957 b: refs/heads/try c: dcc8869 h: refs/heads/master i: 50955: eaa255a v: v3
1 parent 1609bda commit 968bb57

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
5-
refs/heads/try: 2815328e41e0901574cc023fd6aeec4b151635ab
5+
refs/heads/try: dcc88699d8f36ab35cf6b498d9d924526432db26
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/RELEASES.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ Version 0.6 (March 2013)
4141
* Pattern matching over vectors improved and expanded
4242
* `const` renamed to `static` to correspond to lifetime name,
4343
and make room for future `static mut` unsafe mutable globals.
44+
* Replaced `#[deriving_eq]` with `#[deriving(Eq)]`
45+
* `Clone` implementations can be automatically generated with
46+
`#[deriving(Clone)]`
4447

4548
* Semantic changes
4649
* Types with owned pointers or custom destructors move by default,

branches/try/configure

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -444,13 +444,12 @@ fi
444444

445445
if [ ! -z "$CFG_PANDOC" ]
446446
then
447-
PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc ' |
448-
# extract the first 2 version fields, ignore everything else
449-
sed 's/pandoc \([0-9]*\)\.\([0-9]*\).*/\1 \2/')
450-
451-
# these patterns are shell globs, *not* regexps
452-
PV_MAJOR=${PV_MAJOR_MINOR% *}
453-
PV_MINOR=${PV_MAJOR_MINOR#* }
447+
PANDOC_VER_LINE=$(pandoc --version | grep '^pandoc ')
448+
PANDOC_VER=${PANDOC_VER_LINE#pandoc }
449+
PV_MAJOR_MINOR=${PANDOC_VER%.[0-9]*}
450+
PV_MAJOR=${PV_MAJOR_MINOR%%[.][0-9]*}
451+
PV_MINOR=${PV_MAJOR_MINOR#[0-9]*[.]}
452+
PV_MINOR=${PV_MINOR%%[.][0-9]*}
454453
if [ "$PV_MAJOR" -lt "1" ] || [ "$PV_MINOR" -lt "8" ]
455454
then
456455
step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. disabling"

0 commit comments

Comments
 (0)