Ignore:
Timestamp:
Feb 1, 2013 1:25:43 PM (11 years ago)
Author:
Ted Faber <faber@…>
Branches:
master
Children:
17c6d91
Parents:
9a52a80 (diff), 06a2b49 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of tardis.deterlab.net:/var/local/git/fedd

File:
1 edited

Legend:

Unmodified
Added
Removed
  • fedd/federation/util.py

    r06a2b49 r328e93f  
    218218    while not ok and retries < max_retries:
    219219        try:
    220             if log:
    221                 log.debug('Creating HTTPSConnection: %s' % cf)
    222220            conn = httplib.HTTPSConnection(po.hostname, port=po.port,
    223221                    cert_file=cf, key_file=cf, timeout=30)
    224222            conn.putrequest('GET', po.path)
    225223            conn.endheaders()
    226             if log:
    227                 log.debug('Connecting')
    228224            response = conn.getresponse()
    229             if log:
    230                 log.debug('Connected')
    231225
    232226            lf = open("%s/%s" % (destdir, fn), "w")
    233             if log:
    234                 log.debug('initial read')
    235227            buf = response.read(4096)
    236228            while buf:
    237229                lf.write(buf)
    238                 if log:
    239                     log.debug('loop read')
    240230                buf = response.read(4096)
    241231            lf.close()
Note: See TracChangeset for help on using the changeset viewer.