1
0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-26 18:06:13 +01:00

Merge branch 'master' of git@gitorious.org:opensuse/osc

This commit is contained in:
Marcus Huewe 2010-08-30 16:28:37 +02:00
commit 0ae30e00e3
3 changed files with 8 additions and 10 deletions

1
NEWS
View File

@ -16,6 +16,7 @@
- add "osc aggregate --nosources" option
- add "request clone" command to clone all packages from a given request
- fixed references into en.opensuse.org to honor the new Wiki structure
- add cross build targets mips and mipsel for QEMU Usermode. needs also build update.
0.128
- better default commands selection for editor/pager

View File

@ -2036,9 +2036,7 @@ def http_request(method, url, headers={}, data=None, file=None, timeout=100):
filefd = None
if conf.config['http_debug']:
print
print
print '--', method, url
print >>sys.stderr, '\n\n--', method, url
if method == 'POST' and not file and not data:
# adding data to an urllib2 request transforms it into a POST
@ -2090,7 +2088,7 @@ def http_request(method, url, headers={}, data=None, file=None, timeout=100):
else:
raise
if conf.config['debug']: print method, url
if conf.config['debug']: print >>sys.stderr, method, url
old_timeout = socket.getdefaulttimeout()
# XXX: dirty hack as timeout doesn't work with python-m2crypto

View File

@ -92,10 +92,9 @@ class Fetcher:
mg = MirrorGroup(self.gr, pac.urllist, failure_callback=(self.failureReport,(),{}))
if self.http_debug:
print
print 'URLs to try for package \'%s\':' % pac
print '\n'.join(pac.urllist)
print
print >>sys.stderr, '\nURLs to try for package \'%s\':' % pac
print >>sys.stderr, '\n'.join(pac.urllist)
print >>sys.stderr
(fd, tmpfile) = tempfile.mkstemp(prefix='osc_build')
try:
@ -229,8 +228,8 @@ class Fetcher:
sys.exit(0)
except URLGrabError, e:
if self.http_debug:
print "can't fetch key for %s: %s" %(i, e.strerror)
print "url: %s" % url
print >>sys.stderr, "can't fetch key for %s: %s" %(i, e.strerror)
print >>sys.stderr, "url: %s" % url
if os.path.exists(dest):
os.unlink(dest)