[postgis-tickets] r16048 - Fix unpackaged extension creation check

[Sandro Santilli]

Author: strk
Date: 2017-10-22 12:00:29 -0700 (Sun, 22 Oct 2017)
New Revision: 16048

Modified:
   trunk/extensions/postgis/Makefile.in
   trunk/extensions/postgis/unpackaged_check.sql.in
Log:
Fix unpackaged extension creation check

See #3892

Modified: trunk/extensions/postgis/Makefile.in
===================================================================
--- trunk/extensions/postgis/Makefile.in	2017-10-22 18:44:32 UTC (rev 16047)
+++ trunk/extensions/postgis/Makefile.in	2017-10-22 19:00:29 UTC (rev 16048)
@@ -80,7 +80,6 @@
 	cp $< $@
 
 sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: $(EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS) ../../utils/create_unpackaged.pl unpackaged_check.sql Makefile | sql
-	cat $(EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS) | $(PERL) ../../utils/create_unpackaged.pl postgis > $@
 	# Ensure version is correct
 	cat unpackaged_check.sql > $@
 	cat $(EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS) \

Modified: trunk/extensions/postgis/unpackaged_check.sql.in
===================================================================
--- trunk/extensions/postgis/unpackaged_check.sql.in	2017-10-22 18:44:32 UTC (rev 16047)
+++ trunk/extensions/postgis/unpackaged_check.sql.in	2017-10-22 19:00:29 UTC (rev 16048)
@@ -5,8 +5,9 @@
 	ver := split_part(postgis_scripts_installed(), ' ', 1);
 	IF ver != '@EXTVERSION@' THEN
 		RAISE EXCEPTION 'Installed PostGIS version is %', ver
-		USING HINT = 'Try `CREATE EXTENSION postgis VERSION ''@EXTVERSION@'' from unpackaged`,'
-		            'or source postgis_upgrade.sql`';
+		USING HINT = 'Try `CREATE EXTENSION postgis VERSION '''
+			|| ver || ''' from unpackaged`,'
+			' or source postgis_upgrade.sql`';
 	END IF;
 END;
 $$ LANGUAGE 'plpgsql';