At Wed, 13 Jul 2022 18:09:43 +0900 (JST), Kyotaro Horiguchi
<horikyota....@gmail.com> wrote in
> I happened to see the message below.
>
> > WARNING: new data directory should not be inside the old data directory,
> > e.g. %s
>
> The corresponding code is
>
> > ... the old data directory, e.g. %s", old_cluster_pgdata);
>
> So, "e.g." (for example) in the message sounds like "that is", which I
> think is "i.e.". It should be fixed if this is correct. I'm not sure
> whether to keep using Latin-origin acronyms like this, but in the
> attached I used "i.e.".
Oops! There's another use of that word in the same context.
Attached contains two fixes.
regards.
--
Kyotaro Horiguchi
NTT Open Source Software Center
diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
index fda744911d..01ede1e4ad 100644
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -540,7 +540,7 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)
if (path_is_prefix_of_path(old_cluster_pgdata, new_cluster_pgdata))
{
pg_log(PG_WARNING,
- "\nWARNING: new data directory should not be inside the old data directory, e.g. %s", old_cluster_pgdata);
+ "\nWARNING: new data directory should not be inside the old data directory, i.e. %s", old_cluster_pgdata);
/* Unlink file in case it is left over from a previous run. */
unlink(*deletion_script_file_name);
@@ -564,7 +564,7 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)
{
/* reproduce warning from CREATE TABLESPACE that is in the log */
pg_log(PG_WARNING,
- "\nWARNING: user-defined tablespace locations should not be inside the data directory, e.g. %s", old_tablespace_dir);
+ "\nWARNING: user-defined tablespace locations should not be inside the data directory, i.e. %s", old_tablespace_dir);
/* Unlink file in case it is left over from a previous run. */
unlink(*deletion_script_file_name);
