[ARVADOS] updated: 1.1.4-137-g0d209da

Git user git at public.curoverse.com
Fri Apr 20 16:20:53 EDT 2018


Summary of changes:
 services/login-sync/bin/arvados-login-sync | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

       via  0d209da1a7cdf4eecaa7d1658a0ba34f20722b08 (commit)
       via  7b72f9d1b628698277617e9f1b8a9eac1f8dd562 (commit)
       via  0059f6dd744f49e20c2abe9b8bf2c4a3c3a1ace3 (commit)
       via  997795cd2e7fd16686c9e45f40a6fcba3c26a667 (commit)
      from  8da66eb418af5e0584253a5cdc1ad383e26016e7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 0d209da1a7cdf4eecaa7d1658a0ba34f20722b08
Merge: 8da66eb 7b72f9d
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Apr 20 16:18:45 2018 -0400

    Merge branch 'thehyve/master' LocalJumpError in arvados-login-sync
    
    no issue #, github PR 65
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>


commit 7b72f9d1b628698277617e9f1b8a9eac1f8dd562
Author: strangepleasures <pavel at thehyve.nl>
Date:   Fri Apr 20 16:47:46 2018 +0200

    Simplify filtering in arvados-login-sync. Arvados-DCO-1.1-Signed-off-by: Pavel Mikhailovskii <pavel at thehyve.nl>

diff --git a/services/login-sync/bin/arvados-login-sync b/services/login-sync/bin/arvados-login-sync
index b42c784..eb68004 100755
--- a/services/login-sync/bin/arvados-login-sync
+++ b/services/login-sync/bin/arvados-login-sync
@@ -57,9 +57,7 @@ begin
 
   pwnam = Hash.new()
   logins.reject! do |l|
-    if pwnam[l[:username]]
-      false
-    else
+    if not pwnam[l[:username]]
       begin
         pwnam[l[:username]] = Etc.getpwnam(l[:username])
       rescue

commit 0059f6dd744f49e20c2abe9b8bf2c4a3c3a1ace3
Merge: 997795c 5af6a8e
Author: strangepleasures <pavel at thehyve.nl>
Date:   Fri Apr 20 16:29:27 2018 +0200

    Merge remote-tracking branch 'upstream/master'


commit 997795cd2e7fd16686c9e45f40a6fcba3c26a667
Author: strangepleasures <pavel at thehyve.nl>
Date:   Fri Apr 20 16:06:58 2018 +0200

    Fix LocalJumpError in arvados-login-sync. Arvados-DCO-1.1-Signed-off-by: Pavel Mikhailovskii <pavel at thehyve.nl>

diff --git a/services/login-sync/bin/arvados-login-sync b/services/login-sync/bin/arvados-login-sync
index 475ab98..b42c784 100755
--- a/services/login-sync/bin/arvados-login-sync
+++ b/services/login-sync/bin/arvados-login-sync
@@ -57,18 +57,21 @@ begin
 
   pwnam = Hash.new()
   logins.reject! do |l|
-    return false if pwnam[l[:username]]
-    begin
-      pwnam[l[:username]] = Etc.getpwnam(l[:username])
-    rescue
-      if skip_missing_users
-        STDERR.puts "Account #{l[:username]} not found. Skipping"
-        true
-      end
+    if pwnam[l[:username]]
+      false
     else
-      if pwnam[l[:username]].uid < uid_min
-        STDERR.puts "Account #{l[:username]} uid #{pwnam[l[:username]].uid} < uid_min #{uid_min}. Skipping"
-        true
+      begin
+        pwnam[l[:username]] = Etc.getpwnam(l[:username])
+      rescue
+        if skip_missing_users
+          STDERR.puts "Account #{l[:username]} not found. Skipping"
+          true
+        end
+      else
+        if pwnam[l[:username]].uid < uid_min
+          STDERR.puts "Account #{l[:username]} uid #{pwnam[l[:username]].uid} < uid_min #{uid_min}. Skipping"
+          true
+        end
       end
     end
   end

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list