Commit1672529

Gauvain Pocentek

committed

CLI: support a timout option

1 parent9744475 commit1672529Copy full SHA for 1672529

File tree

+12

-1

lines changed

+12

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,4 @@ Koen Smets <koen.smets@gmail.com>`
`14`	`14`	`Mart Sõmermaa <mart.somermaa@cgi.com>`
`15`	`15`	`Diego Giovane Pasqualin <dpasqualin@c3sl.ufpr.br>`
`16`	`16`	`Crestez Dan Leonard <lcrestez@ixiacom.com>`
	`17`	`+Patrick Miller <patrick@velocitywebworks.com>`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ def usage():`
`141`	`141`	`defdo_auth():`
`142`	`142`	`try:`
`143`	`143`	`gl=gitlab.Gitlab(gitlab_url,private_token=gitlab_token,`
`144`		`-ssl_verify=ssl_verify)`
	`144`	`+ssl_verify=ssl_verify,timeout=timeout)`
`145`	`145`	`gl.auth()`
`146`	`146`	`except:`
`147`	`147`	`die("Could not connect to GitLab (%s)"%gitlab_url)`
`@@ -247,6 +247,7 @@ def do_project_owned():`
`247`	`247`
`248`	`248`
`249`	`249`	`ssl_verify=True`
	`250`	`+timeout=60`
`250`	`251`	`gitlab_id=None`
`251`	`252`	`verbose=False`
`252`	`253`
`@@ -325,6 +326,15 @@ try:`
`325`	`326`	`except:`
`326`	`327`	`pass`
`327`	`328`
	`329`	`+try:`
	`330`	`+timeout=config.getboolean('global','timeout')`
	`331`	`+except:`
	`332`	`+pass`
	`333`	`+try:`
	`334`	`+timeout=config.getboolean(gitlab_id,'timeout')`
	`335`	`+except:`
	`336`	`+pass`
	`337`	`+`
`328`	`338`	`try:`
`329`	`339`	`what=args.pop(0)`
`330`	`340`	`action=args.pop(0)`

Comments

(0)