Update for post-b0a5909 changes. thanks @jonathan

3 files changed, 20 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed2242e6a2ed..3e69c3f99b88 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Wed Feb 14 00:26:50 UTC 2018
 pkgbase = zfs-auto-snapshot-git
 	pkgdesc = Implementation of a snapshotting service for ZFS
-	pkgver = 1.2.4.r0.277287f
+	pkgver = 1.2.4.r31.92db087
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/zfsonlinux/zfs-auto-snapshot
@@ -16,7 +14,7 @@ pkgbase = zfs-auto-snapshot-git
 	source = git+https://github.com/zfsonlinux/zfs-auto-snapshot
 	source = prefix_label_order.patch
 	sha512sums = SKIP
-	sha512sums = f0dc350f17bac8b1569e088c7b8c4d097b810eeab1addbf84f79aa5294c96a6353ceaaeb212feb85136f5a190d5ae54ff9a2e5b9441a0cb0960d43518aedfa47
+	sha512sums = 178d60a1fa234d89314eae72d82079ca41d886505fd92af79050e1fe04f1cbb172900151911e37b4e5f3ba50c5cc741b6d1a71bdfd99f0003fad0df77f547af4
 
 pkgname = zfs-auto-snapshot-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 407d8b60aaac..b97a691964e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=zfs-auto-snapshot-git
 pkgdesc="Implementation of a snapshotting service for ZFS"
-pkgver=1.2.4.r0.277287f
+pkgver=1.2.4.r31.92db087
 pkgrel=1
 epoch=1
 arch=('any')
@@ -14,7 +14,7 @@ provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 source=("git+$url" "prefix_label_order.patch")
 sha512sums=('SKIP'
-            'f0dc350f17bac8b1569e088c7b8c4d097b810eeab1addbf84f79aa5294c96a6353ceaaeb212feb85136f5a190d5ae54ff9a2e5b9441a0cb0960d43518aedfa47')
+            '178d60a1fa234d89314eae72d82079ca41d886505fd92af79050e1fe04f1cbb172900151911e37b4e5f3ba50c5cc741b6d1a71bdfd99f0003fad0df77f547af4')
 
 pkgver() {
   cd "$srcdir/${pkgname%-git}"
diff --git a/prefix_label_order.patch b/prefix_label_order.patch
index dc3598afd571..97f66236f467 100644
--- a/prefix_label_order.patch
+++ b/prefix_label_order.patch
@@ -1,27 +1,27 @@
 diff --git a/src/zfs-auto-snapshot.sh b/src/zfs-auto-snapshot.sh
-index 5ef5bae..75ba11d 100755
+index cd88f0f..7639e4d 100644
 --- a/src/zfs-auto-snapshot.sh
 +++ b/src/zfs-auto-snapshot.sh
-@@ -375,9 +375,7 @@ if [ -n "$opt_fast_zfs_list" ]
- then
- 	SNAPSHOTS_OLD=$(env LC_ALL=C zfs list -H -t snapshot -o name -s name | \
- 		grep $opt_prefix | \
--		awk '{ print substr( $0, length($0) - 14, length($0) ) " " $0}' | \
--		sort -r -k1,1 -k2,2 | \
--		awk '{ print substr( $0, 17, length($0) )}') \
-+		sort -t'@' -k2r,2 -k1,1) \
- 	  || { print_log error "zfs list $?: $SNAPSHOTS_OLD"; exit 137; }
- else
- 	SNAPSHOTS_OLD=$(env LC_ALL=C zfs list -H -t snapshot -S creation -o name) \
-@@ -537,10 +535,10 @@ SNAPPROP="-o com.sun:auto-snapshot-desc='$opt_event'"
- DATE=$(date --utc +%F-%H%M)
+@@ -408,9 +408,7 @@ then
+ 	then
+ 		SNAPSHOTS_OLD=$(env LC_ALL=C zfs list -H -t snapshot -o name -s name | \
+ 			grep "$opt_prefix"_"$opt_label" | \
+-			awk '{ print substr( $0, length($0) - 14, length($0) ) " " $0}' | \
+-			sort -r -k1,1 -k2,2 | \
+-			awk '{ print substr( $0, 17, length($0) )}') \
++			sort -t'@' -k2r,2 -k1,1) \
+ 	  	|| { print_log error "zfs list $?: $SNAPSHOTS_OLD"; exit 137; }
+ 	else
+  		SNAPSHOTS_OLD=$(env LC_ALL=C zfs list -H -t snapshot -o name -s name | \
+@@ -588,10 +586,10 @@ SNAPPROP="-o com.sun:auto-snapshot-desc='$opt_event'"
+ DATE=$(date -u +%F-%H%M)
  
  # The snapshot name after the @ symbol.
--SNAPNAME="$opt_prefix${opt_label:+$opt_sep$opt_label}-$DATE"
+-SNAPNAME="${opt_prefix:+$opt_prefix$opt_sep}${opt_label:+$opt_label}-$DATE"
 +SNAPNAME="${opt_prefix}_$DATE${opt_label:+$opt_sep$opt_label}"
  
  # The expression for matching old snapshots.  -YYYY-MM-DD-HHMM
--SNAPGLOB="$opt_prefix${opt_label:+?$opt_label}????????????????"
+-SNAPGLOB="${opt_prefix:+$opt_prefix$opt_sep}${opt_label:+$opt_label}-???????????????"
 +SNAPGLOB="${opt_prefix}????????????????${opt_label:+?$opt_label}"
  
  if [ -n "$opt_do_snapshots" ]