Merge lp:~smoser/pollinate/trunk.print-user-agent into lp:~pollinate/pollinate/trunk

Proposed by Scott Moser
Status: Merged
Merged at revision: 365
Proposed branch: lp:~smoser/pollinate/trunk.print-user-agent
Merge into: lp:~pollinate/pollinate/trunk
Diff against target: 29 lines (+8/-0)
2 files modified
pollinate (+5/-0)
pollinate.1 (+3/-0)
To merge this branch: bzr merge lp:~smoser/pollinate/trunk.print-user-agent
Reviewer Review Type Date Requested Status
pollinate Pending
Review via email: mp+337395@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote :

also makes testing changes to user-agent easier.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'pollinate'
--- pollinate 2018-01-30 22:28:52 +0000
+++ pollinate 2018-02-08 22:29:39 +0000
@@ -263,6 +263,11 @@
263 WAIT="$2"263 WAIT="$2"
264 shift 2264 shift 2
265 ;;265 ;;
266 --print-user-agent)
267 user_agent || error "Failed to get user-agent."
268 echo "${USER_AGENT}"
269 exit
270 ;;
266 *)271 *)
267 error "Unknown options [$1]"272 error "Unknown options [$1]"
268 ;;273 ;;
269274
=== modified file 'pollinate.1'
--- pollinate.1 2016-05-05 22:08:16 +0000
+++ pollinate.1 2018-02-08 22:29:39 +0000
@@ -45,6 +45,9 @@
45.TP45.TP
46\fB-w|--wait\fP WAIT46\fB-w|--wait\fP WAIT
47time in seconds you're willing to wait for a response from the server, uses \fBtimeout\fP(1)47time in seconds you're willing to wait for a response from the server, uses \fBtimeout\fP(1)
48.TP
49\fB --print-user-agent\fP
50Print the user-agent that is used and exit immediately.
4851
49.SH SEE ALSO52.SH SEE ALSO
50\fBpollen\fP(8), \fBtimeout\fP(1)53\fBpollen\fP(8), \fBtimeout\fP(1)

Subscribers

People subscribed via source and target branches

to all changes: