From d56ab3f83c32410a7353aeb101e3c596a04094c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCdepohl?= <lorenz.huedepohl@rzg.mpg.de>
Date: Wed, 15 Jan 2020 11:54:06 +0100
Subject: [PATCH] Update with new repo path
---
mpcdf_common.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/mpcdf_common.py b/mpcdf_common.py
index 40446c6..b33ea46 100644
--- a/mpcdf_common.py
+++ b/mpcdf_common.py
@@ -68,7 +68,7 @@ def check_for_update():
git_dir = os.path.join(plugin_dir, ".git")
local_rev = check_output(["git", "--git-dir", git_dir, "rev-parse", "HEAD"], **set_encoding).strip()
- url = "https://gitlab.mpcdf.mpg.de/mpcdf/osc-plugins.git"
+ url = "https://gitlab.mpcdf.mpg.de/mpcdf/obs/osc-plugins.git"
def update_server_rev():
server_rev, _ = check_output(["git", "ls-remote", url, "master"], **set_encoding).split(None, 1)
@@ -96,13 +96,13 @@ def check_for_update():
server_rev = fd.read().strip()
if server_rev != local_rev:
+ print("Note from MPCDF osc plugins:", file=sys.stderr)
if call(["git", "--git-dir", git_dir, "merge-base", "--is-ancestor", server_rev, "HEAD"]) == 0:
- print(file=sys.stderr)
- print("You have unpushed commits in", plugin_dir, "- consider pushing them", file=sys.stderr)
+ print(" You have unpushed commits in", plugin_dir, "- consider pushing them", file=sys.stderr)
print(file=sys.stderr)
else:
- print(file=sys.stderr)
- print("Your plugin directory is out-of-date, new commits available on", url, file=sys.stderr)
+ print(" Your plugin directory is out-of-date, new commits available on", url, file=sys.stderr)
+ print(" (careful: the repo has been moved, update your path to point to the new URL)", file=sys.stderr)
print(file=sys.stderr)
--
GitLab