/contrib/foo -> contrib/foo

petere · petere · commit 0ee391b77a8a · 2011-05-19T00:30:31.000+03:00
Since contrib is a relative directory specification, a leading slash
is inappropriate.
diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
@@ -507,7 +507,7 @@ check_is_super_user(ClusterInfo *cluster)
 /*
  *	check_for_isn_and_int8_passing_mismatch()
  *
- *	/contrib/isn relies on data type int8, and in 8.4 int8 can now be passed
+ *	contrib/isn relies on data type int8, and in 8.4 int8 can now be passed
  *	by value.  The schema dumps the CREATE TYPE PASSEDBYVALUE setting so
  *	it must match for the old and new servers.
  */
@@ -519,7 +519,7 @@ check_for_isn_and_int8_passing_mismatch(ClusterInfo *cluster)
 	bool		found = false;
 	char		output_path[MAXPGPATH];
 
-	prep_status("Checking for /contrib/isn with bigint-passing mismatch");
+	prep_status("Checking for contrib/isn with bigint-passing mismatch");
 
 	if (old_cluster.controldata.float8_pass_by_value ==
 		new_cluster.controldata.float8_pass_by_value)
@@ -581,12 +581,12 @@ check_for_isn_and_int8_passing_mismatch(ClusterInfo *cluster)
 	{
 		pg_log(PG_REPORT, "fatal\n");
 		pg_log(PG_FATAL,
-			   "| Your installation contains \"/contrib/isn\" functions\n"
+			   "| Your installation contains \"contrib/isn\" functions\n"
 			   "| which rely on the bigint data type.  Your old and\n"
 			   "| new clusters pass bigint values differently so this\n"
 			   "| cluster cannot currently be upgraded.  You can\n"
-			   "| manually upgrade data that use \"/contrib/isn\"\n"
-			   "| facilities and remove \"/contrib/isn\" from the\n"
+			   "| manually upgrade data that use \"contrib/isn\"\n"
+			   "| facilities and remove \"contrib/isn\" from the\n"
 			   "| old cluster and restart the upgrade.  A list\n"
 			   "| of the problem functions is in the file:\n"
 			   "| \t%s\n\n", output_path);
diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c
@@ -330,7 +330,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
 				pg_log(PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);
 
 			p++;				/* removing ':' char */
-			/* used later for /contrib check */
+			/* used later for contrib check */
 			cluster->controldata.float8_pass_by_value = strstr(p, "by value") != NULL;
 			got_float8_pass_by_value = true;
 		}
diff --git a/doc/src/sgml/release-9.1.sgml b/doc/src/sgml/release-9.1.sgml
@@ -2272,7 +2272,7 @@
 
      <listitem>
       <para>
-       Modify <filename>/contrib</> modules and stored procedure
+       Modify <filename>contrib</> modules and stored procedure
        languages to install via the new <link
        linkend="extension">extension</link> mechanism (Tom Lane,
        Dimitri Fontaine)

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)`
`330`	`330`	`pg_log(PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);`
`331`	`331`
`332`	`332`	`p++; /* removing ':' char */`
`333`		`- /* used later for /contrib check */`
	`333`	`+ /* used later for contrib check */`
`334`	`334`	`cluster->controldata.float8_pass_by_value = strstr(p, "by value") != NULL;`
`335`	`335`	`got_float8_pass_by_value = true;`
`336`	`336`	`}`