Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Typos c2cupgrade #4748

Merged
merged 1 commit into from
Mar 15, 2019
Merged

Typos c2cupgrade #4748

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions geoportal/c2cgeoportal_geoportal/scripts/c2cupgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def decorate(c2cupgradetool, *args, **kwargs):
def message():
c2cupgradetool.print_step(
self.step_number, error=True,
message="The step get an error '{}'.".format(ex),
message="The step had the error '{}'.".format(ex),
prompt="Fix the error and run the step again:"
)
atexit.register(message)
Expand Down Expand Up @@ -572,10 +572,10 @@ def files_to_get(self, step, pre=False):
except PermissionError as e:
self.print_step(
step, error=True, message=(
"All your project files should be own by your user, "
"All your project files should be owned by your user, "
"current error:\n" + str(e)
),
prompt="Fix it and run again the upgrade:")
prompt="Fix it and run the upgrade again:")
exit(1)

elif os.path.exists(destination) and not filecmp.cmp(source, destination):
Expand Down Expand Up @@ -640,7 +640,7 @@ def step9(self, step):
step + 1,
message="Manually apply the ngeo application changes as shown in the `ngeo.diff` file.\n" +
DIFF_NOTICE +
"\nNote that you can also apply it using: git apply --3way ngeo.diff"
"\nNote that you can also apply them using: git apply --3way ngeo.diff"
)

@Step(10)
Expand Down Expand Up @@ -671,7 +671,7 @@ def step10(self, step):
self.print_step(
step + 1, message="The `create.diff` file is a recommendation of the changes that you "
"should apply to your project.\n" + DIFF_NOTICE +
"\nNote that you can also apply it using: git apply --3way create.diff"
"\nNote that you can also apply them using: git apply --3way create.diff"
)
else:
self.run_step(step + 1)
Expand Down