createlang now returns 2 for language already exists.

bmomjian · bmomjian · commit cda192317a6b · 1999-07-09T17:57:46.000Z
diff --git a/src/bin/createlang/createlang.sh b/src/bin/createlang/createlang.sh
@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/createlang/Attic/createlang.sh,v 1.1 1999/05/20 16:50:00 wieck Exp $
+#    $Header: /cvsroot/pgsql/src/bin/createlang/Attic/createlang.sh,v 1.2 1999/07/09 17:57:46 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -140,7 +140,7 @@ if [ $? -ne 0 ]; then
 fi
 if [ ! -z "$res" ]; then
 	echo "The language '$langname' is already installed in database $dbname"
-	exit 1
+	exit 2
 fi
 
 # ----------
diff --git a/src/test/regress/regress.sh b/src/test/regress/regress.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.30 1999/06/14 17:49:06 tgl Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.31 1999/07/09 17:57:46 momjian Exp $
 #
 if [ $# -eq 0 ]
 then
@@ -69,7 +69,7 @@ fi
 
 echo "=============== installing PL/pgSQL...                ================="
 createlang $HOST plpgsql regression
-if [ $? -ne 0 ]; then
+if [ $? -ne 0 -a $? -ne 2 ]; then
      echo createlang failed
      exit 1
 fi

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#`
`9`	`9`	`#`
`10`	`10`	`# IDENTIFICATION`
`11`		`-# $Header: /cvsroot/pgsql/src/bin/createlang/Attic/createlang.sh,v 1.1 1999/05/20 16:50:00 wieck Exp $`
	`11`	`+# $Header: /cvsroot/pgsql/src/bin/createlang/Attic/createlang.sh,v 1.2 1999/07/09 17:57:46 momjian Exp $`
`12`	`12`	`#`
`13`	`13`	`#-------------------------------------------------------------------------`
`14`	`14`
`@@ -140,7 +140,7 @@ if [ $? -ne 0 ]; then`
`140`	`140`	`fi`
`141`	`141`	`if [ ! -z "$res" ]; then`
`142`	`142`	`echo "The language '$langname' is already installed in database $dbname"`
`143`		`- exit 1`
	`143`	`+ exit 2`
`144`	`144`	`fi`
`145`	`145`
`146`	`146`	`# ----------`