Looks good to me; feel free to merge.
-Richard
On 2015-04-06 23:33, David Mandelberg wrote:
> This reverts commit 11256f43dfccc44b0cf6f3c37c7d418d5fffe2e9.
>
> Conflicts:
> rsync_aur/rsync_cord.py.in
>
> I ran the below command, which showed no errors. It appears that all
> the active RPKI repository servers I know about now support the -s
> option.
>
> for x in \
> ca0.rpki.net/tal/root.cer \
> localcert.ripe.net/ta/ripe-ncc-pilot.cer \
> msft-rpki.trafficmanager.net/rpki/MSFT/8H_jmllWbmWudxDtQ51Xf7C1Rj8.roa \
>
> repository.lacnic.net/rpki/lacnic/6084538623a018b8e38c30de240e596a5ffe220b.cer
> \
> rpki-02.rarc.net/rpki/GOOG-morrowc-02/B0xf7hwJItZ0wjGUkhMEGoTxaaU.roa \
> rpki.afrinic.net/repository/AfriNIC.cer \
> rpki.apnic.net/repository/apnic-rpki-root-iana-origin.cer \
> rpki.arin.net/repository/arin-rpki-ta.cer \
> rpki-pilot.lab.dtag.de/rpki/DTAG/5ADCvGnnRe4-kzUicBvSMR-EngE.mft \
> rpki.rarc.net/rpki/GOOG-morrowc/3FZuvFwikROmOHSp3_DQRRqvxN8.roa \
> rpki-repository.nic.ad.jp/ta/jpnic.cer \
> rpki.ripe.net/ta/ripe-ncc-ta.cer \
> rpki-testbed.apnic.net/repository/rpki-testbed.apnic.net.cer
> do
> echo "rsync://$x"
> rsync -Lirzts --del --no-motd -- \
> "rsync://$x" /tmp/tmp.khxGTo3MkJ/ \
> || { echo $?; break; }
> done
> ---
> bin/rpki-rsync/rsync_cord.py.in | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/bin/rpki-rsync/rsync_cord.py.in b/bin/rpki-rsync/rsync_cord.py.in
> index 6cb8872..09240ba 100644
> --- a/bin/rpki-rsync/rsync_cord.py.in
> +++ b/bin/rpki-rsync/rsync_cord.py.in
> @@ -48,15 +48,15 @@ class RSYNC_thread(Thread):
> #build and run the rsync command. This may block for awhile but
> that
> #is the beauty of the multiple threads.
> rsyncCom = [rsyncDir,
> - "-Lirzt",
> + "-Lirzts",
> "--del",
> #"--max-size=10K",
> "--timeout=10",
> "--contimeout=10",
> "--no-motd",
> "--",
> - "rsync://%s/" % nextURI.replace("\\",
> "\\\\").replace(" ", "\\ "),
> - "%s/%s" % (repoDir, nextURI.replace("\\",
> "\\\\").replace(" ", "\\ "))]
> + "rsync://%s/" % nextURI,
> + "%s/%s" % (repoDir, nextURI)]
>
> cli.info( "starting %s" % nextURI )
>
>
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
rpstir-devel mailing list
rpstir-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpstir-devel
