5 files changed, 48 insertions, 2 deletions
diff --git a/t/05-upgrade.t b/t/05-upgrade.t
index 53a4210..4cdc047 100755
--- a/t/05-upgrade.t
+++ b/t/05-upgrade.t
@@ -11,7 +11,7 @@ use Test::Sbotools qw/ make_slackbuilds_txt set_lo sboconfig sboinstall sboupgra
 use File::Temp 'tempdir';
 
 if ($ENV{TEST_INSTALL}) {
-	plan tests => 15;
+	plan tests => 16;
 } else {
 	plan skip_all => 'Only run these tests if TEST_INSTALL=1';
 }
@@ -23,10 +23,12 @@ sub cleanup {
 		system(qw!/sbin/removepkg nonexistentslackbuild4!);
 		system(qw!/sbin/removepkg nonexistentslackbuild5!);
 		system(qw!/sbin/removepkg nonexistentslackbuild6!);
+		system(qw!/sbin/removepkg weird-versionsbo!);
 		unlink "$RealBin/LO/nonexistentslackbuild/perf.dummy";
 		unlink "$RealBin/LO/nonexistentslackbuild4/perf.dummy";
 		unlink "$RealBin/LO/nonexistentslackbuild5/perf.dummy";
 		unlink "$RealBin/LO/nonexistentslackbuild6/perf.dummy";
+		unlink "$RealBin/LO/weird-versionsbo/perf.dummy";
 		unlink "$RealBin/LO2/nonexistentslackbuild/perf.dummy";
 		unlink "$RealBin/LO2/nonexistentslackbuild4/perf.dummy";
 		unlink "$RealBin/LO2/nonexistentslackbuild5/perf.dummy";
@@ -42,6 +44,7 @@ sub cleanup {
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild4-1.0!);
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild5-1.0!);
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild6-1.0!);
+		system(qw!rm -rf /tmp/SBo/weird-versionsbo-1.0!);
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild-1.1!);
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild4-1.1!);
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild5-1.1!);
@@ -50,6 +53,7 @@ sub cleanup {
 		system(qw!rm -rf /tmp/package-nonexistentslackbuild4!);
 		system(qw!rm -rf /tmp/package-nonexistentslackbuild5!);
 		system(qw!rm -rf /tmp/package-nonexistentslackbuild6!);
+		system(qw!rm -rf /tmp/package-weird-versionsbo!);
 	};
 }
 
@@ -116,6 +120,12 @@ sboupgrade '--all', { input => ("n\n" x (@sbos+3)), expected => qr/Proceed with
 set_lo("$RealBin/LO");
 sboupgrade '--all', { expected => "Checking for updated SlackBuilds...\nNothing to update.\n" };
 
+cleanup();
+
+# 16: sboupgrade --all shouldn't pick up weird-versionsbo
+install('LO', 'weird-versionsbo');
+sboupgrade '--all', { input => ("n\n" x (@sbos+1)), expected => sub { not /weird-versionsbo/ } };
+
 # Cleanup
 END {
 	cleanup();
diff --git a/t/13-local-check.t b/t/13-local-check.t
index 369305a..5349ce6 100755
--- a/t/13-local-check.t
+++ b/t/13-local-check.t
@@ -10,7 +10,7 @@ use lib $RealBin;
 use Test::Sbotools qw/ make_slackbuilds_txt set_lo set_repo sbosnap sbocheck sboinstall sbofind restore_perf_dummy /;
 
 if ($ENV{TEST_INSTALL} and $ENV{TRAVIS}) {
-	plan tests => 12;
+	plan tests => 13;
 } else {
 	plan skip_all => "Only run these tests if TEST_INSTALL=1 and we're running under Travis CI";
 }
@@ -25,7 +25,9 @@ sub cleanup {
 		system(qw!/sbin/removepkg nonexistentslackbuildwithareallyverylon!);
 		system(qw!/sbin/removepkg nonexistentslackbuildwithareallyverylong!);
 		system(qw!/sbin/removepkg s2!);
+		system(qw!/sbin/removepkg weird-versionsbo!);
 		unlink "$RealBin/LO/nonexistentslackbuild/perf.dummy";
+		unlink "$RealBin/LO/weird-versionsbo/perf.dummy";
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild-1.0!);
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuild5-1.0!);
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuildwithareallyverylongnameasyoucansee-1.0!);
@@ -34,6 +36,7 @@ sub cleanup {
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuildwithareallyverylon-1.0!);
 		system(qw!rm -rf /tmp/SBo/nonexistentslackbuildwithareallyverylon-1.0g!);
 		system(qw!rm -rf /tmp/SBo/s2-1.0!);
+		system(qw!rm -rf /tmp/SBo/weird-versionsbo-1.0!);
 		system(qw!rm -rf /tmp/package-nonexistentslackbuild!);
 		system(qw!rm -rf /tmp/package-nonexistentslackbuild5!);
 		system(qw!rm -rf /tmp/package-nonexistentslackbuildwithareallyverylongnameasyoucansee!);
@@ -42,6 +45,7 @@ sub cleanup {
 		system(qw!rm -rf /tmp/package-nonexistentslackbuildwithareallyverylon!);
 		system(qw!rm -rf /tmp/package-nonexistentslackbuildwithareallyverylong!);
 		system(qw!rm -rf /tmp/package-s2!);
+		system(qw!rm -rf /tmp/package-weird-versionsbo!);
 		system(qw!rm -rf!, "$RealBin/gitrepo");
 	};
 }
@@ -146,6 +150,11 @@ sboinstall 's2', { input => "y\ny", test => 0 };
 set_lo("$RealBin/LO2");
 sbocheck { expected => qr/\Qs2 1.0                      <  needs updating (1.1 from overrides)/ };
 
+# 13: check weird-versionsbo isn't picked up erroneously
+set_lo("$RealBin/LO");
+sboinstall 'weird-versionsbo', { input => "y\ny", test => 0 };
+sbocheck { expected => sub { not /weird-versionsbo/ } };
+
 # Cleanup
 END {
 	cleanup();
diff --git a/t/LO/weird-versionsbo/README b/t/LO/weird-versionsbo/README
new file mode 100644
index 0000000..6d388bb
--- /dev/null
+++ b/t/LO/weird-versionsbo/README
@@ -0,0 +1 @@
+This doesn't exist!
diff --git a/t/LO/weird-versionsbo/weird-versionsbo.SlackBuild b/t/LO/weird-versionsbo/weird-versionsbo.SlackBuild
new file mode 100644
index 0000000..e3e8445
--- /dev/null
+++ b/t/LO/weird-versionsbo/weird-versionsbo.SlackBuild
@@ -0,0 +1,16 @@
+#!/bin/bash
+PRGNAM="weird-versionsbo"
+KERNELVERSION=$(uname -r)
+VERSION=${VERSION:-1.0_$KERNELVERSION}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+TMP=${TMP:-/tmp/SBo}
+OUTPUT=${OUTPUT:-/tmp}
+
+mkdir -p $TMP/$PRGNAM-$VERSION
+cp README $TMP/$PRGNAM-$VERSION
+mkdir -p $OUTPUT/package-$PRGNAM/usr/doc/$PRGNAM-$VERSION
+cp README $OUTPUT/package-$PRGNAM/usr/doc/$PRGNAM-$VERSION
+cd $OUTPUT/package-$PRGNAM
+
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-noarch-$BUILD$TAG.tgz
diff --git a/t/LO/weird-versionsbo/weird-versionsbo.info b/t/LO/weird-versionsbo/weird-versionsbo.info
new file mode 100644
index 0000000..63b4808
--- /dev/null
+++ b/t/LO/weird-versionsbo/weird-versionsbo.info
@@ -0,0 +1,10 @@
+PRGNAM="weird-versionsbo"
+VERSION="1.0"
+HOMEPAGE="http://www.example.com"
+DOWNLOAD="http://pink-mist.github.io/sbotools/testing/perf.dummy"
+MD5SUM="9cba6c70fb57a22a155073d54748b614"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Andreas Guldstrand"
+EMAIL="doesnt@matter.org"