[sysadmin-bin] update_sites.py to be GitLab compatible



commit ac93e6286986c10b359e324b4199a874bff27aad
Author: Andrea Veri <averi redhat com>
Date:   Wed May 30 11:03:48 2018 +0200

    update_sites.py to be GitLab compatible

 gnomeweb/update_sites.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gnomeweb/update_sites.py b/gnomeweb/update_sites.py
index 175b986..c3883b8 100755
--- a/gnomeweb/update_sites.py
+++ b/gnomeweb/update_sites.py
@@ -23,7 +23,7 @@ from git import *
 
 timestamp_dir = "/usr/local/www/gnomeweb/timestamps"
 hookscripts_dir = "/usr/local/www/gnomeweb/hooks"
-checkout_url = "git://git.gnome.org/%(module)s"
+checkout_url = "https://gitlab.gnome.org/Infrastructure/%(module)s"
 checkout_basedir = "/var/cache/gnomeweb/git" # default base directory for checkouts
 log_dir = "/usr/local/www/gnomeweb/logs"
 re_branch_versioned = r'^gnome-([0-9]+)-([0-9]+)$'
@@ -31,7 +31,7 @@ re_branch_versioned = r'^gnome-([0-9]+)-([0-9]+)$'
 FAILURE_MAIL = """Failure updating %(url)s.
 
 Last commit by: %(committer)s
-CGIT: http://git.gnome.org/browse/%(module)s/commit/?id=%(rev)s
+GITLAB: https://gitlab.gnome.org/Infrastructure/%(module)s/commit/%(rev)s
 
 THE PERSON WHO BREAKS THE BUILD IS RESPONSIBLE TO FIX IT!
 
@@ -39,7 +39,7 @@ Last few lines of output:
 
 %(outputtail)s
 
-Full output can be seen at http://www.gnome.org/updatelogs/%(checkfile)s.out"""
+Full output can be seen at http://webapps.gnome.org/%(checkfile)s.out"""
 
 
 parser = OptionParser()
@@ -116,7 +116,7 @@ def update_modules(configfile, configdir, verbose):
 
                 b_moduleroot = '%s-%s' % (moduleroot, version)
                 b_url = moduleroot
-                update_module(module, b_checkfile, b_moduleroot, b_url, owner, branch=branch, 
+                update_module(module, b_checkfile, b_moduleroot, b_url, owner, branch=branch,
                               real_remote_url=url, verbose=verbose)
             if lock:
                 lock.close()
@@ -248,7 +248,7 @@ def update_module(module, checkfile, moduleroot, url, owner, branch='master', ve
         committer, rev = get_git_info(moduleroot)
         outputtail = subprocess.Popen(["tail", "-n30", logfile_name], 
stdout=subprocess.PIPE).communicate()[0]
         mailmessage = FAILURE_MAIL % locals()
-        
+
         # Send the mail
         cmd = ['mail', '-s', "Failure updating %s" % url, committer]
         if owner:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]