[sysadmin-bin] Avoid the 'user' variable reassignment (https://gitlab.gnome.org/Infrastructure/GitLab/issues/110)



commit 9c6d32ab57f0b4bca691baa909206579460fa3c8
Author: Andrea Veri <averi redhat com>
Date:   Thu Jan 25 14:50:23 2018 +0100

    Avoid the 'user' variable reassignment (https://gitlab.gnome.org/Infrastructure/GitLab/issues/110)

 git/gnome-post-receive-email | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/git/gnome-post-receive-email b/git/gnome-post-receive-email
index 6eb1f4c..6f1b002 100755
--- a/git/gnome-post-receive-email
+++ b/git/gnome-post-receive-email
@@ -140,17 +140,17 @@ class RefChange(object):
                         user_fullname = user.attributes['name']
                         user_fullname = user_fullname.encode('utf-8')
 
-                        user = username
+                        user_entry = username
         else:
-            user = os.environ['USER']
+            user_entry = os.environ['USER']
 
         if user_fullname:
-            from_address = "%s <%s src gnome org>" % (Header.Header(user_fullname.decode('utf-8')), user)
+            from_address = "%s <%s src gnome org>" % (Header.Header(user_fullname.decode('utf-8')), 
user_entry)
         else:
             if is_gitlab:
                 from_address = "%s <%s>" % (Header.Header(user.attributes['name']), user.attributes['email'])
             else:
-                from_address = "%s src gnome org" % (user)
+                from_address = "%s src gnome org" % (user_entry)
 
         if cc is None:
             cc = self.cc


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