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

C2ctool will not manage anymore CGXP #2155

Merged
merged 1 commit into from
Apr 13, 2016
Merged

C2ctool will not manage anymore CGXP #2155

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
27 changes: 0 additions & 27 deletions c2cgeoportal/scripts/c2ctool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,14 +220,6 @@ def upgrade(self):
def step0(self):
if re.match(VERSION_RE, self.options.version) is not None:
http = httplib2.Http()
headers, _ = http.request(
"https://github.com/camptocamp/CGXP/tree/%s" %
self.options.version, "HEAD"
)
if headers.status != 200:
print("This CGXP tag does not exist.")
exit(1)

headers, _ = http.request(
DEFAULT_C2CGEOPORTAL_URL % {
"version": self.options.version
Expand Down Expand Up @@ -296,23 +288,6 @@ def step1(self):
print(colorize("Please solve the rebase and run the step again.", YELLOW))
exit(1)

check_call(["git", "submodule", "foreach", "git", "fetch", "origin"])
if self.options.version == "master":
check_call([
"git", "submodule", "foreach", "git", "reset", "--hard",
"origin/%s" % self.options.version, "--"
])
elif re.match(VERSION_RE, self.options.version) is not None:
check_call([
"git", "submodule", "foreach", "git", "reset", "--hard",
self.options.version, "--"
])
else:
notes.append(
"We can't define the cgxp revision, than you should manually do:\n"
"git submodule foreach git reset --hard <revision>"
)

check_call(["git", "submodule", "foreach", "git", "submodule", "sync"])
check_call(["git", "submodule", "foreach", "git", "submodule", "update", "--init"])

Expand Down Expand Up @@ -396,8 +371,6 @@ def step3(self):
check_call(["git", "reset", "--mixed"])

check_call(["git", "add", "-A"])
if path.exists("%s/static/lib/cgxp" % self.project["project_package"]):
check_call(["git", "add", "%s/static/lib/cgxp" % self.project["project_package"]])
check_call(["git", "status"])

print("")
Expand Down