r337 - in /debtorrent/trunk: DebTorrent/BT1/makemetafile.py test.py
camrdale-guest at users.alioth.debian.org
camrdale-guest at users.alioth.debian.org
Sun Jan 20 01:07:42 UTC 2008
Author: camrdale-guest
Date: Sun Jan 20 01:07:42 2008
New Revision: 337
URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=337
Log:
Fix some mistakes in the previous merges, and make the tests work again.
Modified:
debtorrent/trunk/DebTorrent/BT1/makemetafile.py
debtorrent/trunk/test.py
Modified: debtorrent/trunk/DebTorrent/BT1/makemetafile.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/BT1/makemetafile.py?rev=337&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/BT1/makemetafile.py (original)
+++ debtorrent/trunk/DebTorrent/BT1/makemetafile.py Sun Jan 20 01:07:42 2008
@@ -835,9 +835,9 @@
try:
sub_pieces = getsubpieces('_'.join(self.path))
- (piece_ordering, ordering_headers) = getordering('_'.join(path))
+ (piece_ordering, ordering_headers) = getordering('_'.join(self.path))
if self.config['separate_all']:
- (piece_ordering_all, ordering_all_headers) = getordering('_'.join(path), all = True)
+ (piece_ordering_all, ordering_all_headers) = getordering('_'.join(self.path), all = True)
else:
piece_ordering_all = {}
ordering_all_headers = {}
@@ -853,14 +853,20 @@
logger.exception('Failed to create torrent for: %s', self.name)
del h[:]
return
-
+
name = self.name
if info and self.config['separate_all'] in (0, 2, 3):
- self.responses.append(self._create_response(info, ordering_headers, name))
+ try:
+ self.responses.append(self._create_response(info, ordering_headers, name))
+ except:
+ logger.exception('Creating the response dictionary failed.')
name = convert_all(self.name)
if info_all and self.config['separate_all'] in (1, 3):
- self.responses.append(self._create_response(info_all, ordering_all_headers, name))
+ try:
+ self.responses.append(self._create_response(info_all, ordering_all_headers, name))
+ except:
+ logger.exception('Creating the response dictionary failed.')
self.sched(self._finished)
@@ -879,11 +885,12 @@
response = {'info': info,
'announce': self.config['default_tracker'],
'name': uniconvert(name)}
+
if "Tracker" in headers:
response['announce'] = headers["Tracker"].strip()
del headers["Tracker"]
if "Torrent" in headers:
- response['identifier'] = a2b_hex(headers["Torrent"].strip())
+ response['identifier'] = binascii.a2b_hex(headers["Torrent"].strip())
del headers["Torrent"]
for header, value in headers.items():
response[header] = value.strip()
Modified: debtorrent/trunk/test.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/test.py?rev=337&op=diff
==============================================================================
--- debtorrent/trunk/test.py (original)
+++ debtorrent/trunk/test.py Sun Jan 20 01:07:42 2008
@@ -55,7 +55,6 @@
(1, ['install', 'ada-reference-manual']),
(1, ['install', 'aspectj-doc']),
(1, ['install', 'fop-doc']),
- (1, ['install', 'jswat-doc']),
(1, ['install', 'asis-doc']),
(1, ['install', 'bison-doc']),
(1, ['install', 'crash-whitepaper']),
@@ -72,7 +71,6 @@
(1, ['install', 'aap-doc']),
(1, ['install', 'ada-reference-manual']),
(1, ['install', 'fop-doc']),
- (1, ['install', 'jswat-doc']),
(1, ['install', 'bison-doc']),
(1, ['install', 'crash-whitepaper']),
(2, ['update']),
@@ -80,7 +78,6 @@
(2, ['install', 'aap-doc']),
(2, ['install', 'ada-reference-manual']),
(2, ['install', 'fop-doc']),
- (2, ['install', 'jswat-doc']),
(2, ['install', 'bison-doc']),
(2, ['install', 'crash-whitepaper']),
]),
@@ -178,10 +175,10 @@
{1: (1, [], {})},
[(1, ['update']),
(1, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual',
- 'aspectj-doc', 'fop-doc', 'jswat-doc', 'asis-doc',
+ 'aspectj-doc', 'fop-doc', 'asis-doc',
'bison-doc', 'crash-whitepaper', 'doc-iana',
'bash-doc', 'apt-howto-common', 'autotools-dev',
- 'aptitude-doc-en', 'armagetron-common', 'asr-manpages',
+ 'aptitude-doc-en', 'asr-manpages',
'atomix-data', 'alcovebook-sgml-doc', 'alamin-doc',
'aegis-doc', 'afbackup-common', 'airstrike-common',
]),
@@ -197,55 +194,55 @@
6: (1, [], {})},
[(1, ['update']),
(1, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual',
- 'aspectj-doc', 'fop-doc', 'jswat-doc', 'asis-doc',
+ 'aspectj-doc', 'fop-doc', 'asis-doc',
'bison-doc', 'crash-whitepaper', 'doc-iana',
'bash-doc', 'apt-howto-common', 'autotools-dev',
- 'aptitude-doc-en', 'armagetron-common', 'asr-manpages',
+ 'aptitude-doc-en', 'asr-manpages',
'atomix-data', 'alcovebook-sgml-doc', 'alamin-doc',
'aegis-doc', 'afbackup-common', 'airstrike-common',
]),
(2, ['update']),
(2, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual',
- 'aspectj-doc', 'fop-doc', 'jswat-doc', 'asis-doc',
+ 'aspectj-doc', 'fop-doc', 'asis-doc',
'bison-doc', 'crash-whitepaper', 'doc-iana',
'bash-doc', 'apt-howto-common', 'autotools-dev',
- 'aptitude-doc-en', 'armagetron-common', 'asr-manpages',
+ 'aptitude-doc-en', 'asr-manpages',
'atomix-data', 'alcovebook-sgml-doc', 'alamin-doc',
'aegis-doc', 'afbackup-common', 'airstrike-common',
]),
(3, ['update']),
(3, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual',
- 'aspectj-doc', 'fop-doc', 'jswat-doc', 'asis-doc',
+ 'aspectj-doc', 'fop-doc', 'asis-doc',
'bison-doc', 'crash-whitepaper', 'doc-iana',
'bash-doc', 'apt-howto-common', 'autotools-dev',
- 'aptitude-doc-en', 'armagetron-common', 'asr-manpages',
+ 'aptitude-doc-en', 'asr-manpages',
'atomix-data', 'alcovebook-sgml-doc', 'alamin-doc',
'aegis-doc', 'afbackup-common', 'airstrike-common',
]),
(4, ['update']),
(4, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual',
- 'aspectj-doc', 'fop-doc', 'jswat-doc', 'asis-doc',
+ 'aspectj-doc', 'fop-doc', 'asis-doc',
'bison-doc', 'crash-whitepaper', 'doc-iana',
'bash-doc', 'apt-howto-common', 'autotools-dev',
- 'aptitude-doc-en', 'armagetron-common', 'asr-manpages',
+ 'aptitude-doc-en', 'asr-manpages',
'atomix-data', 'alcovebook-sgml-doc', 'alamin-doc',
'aegis-doc', 'afbackup-common', 'airstrike-common',
]),
(5, ['update']),
(5, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual',
- 'aspectj-doc', 'fop-doc', 'jswat-doc', 'asis-doc',
+ 'aspectj-doc', 'fop-doc', 'asis-doc',
'bison-doc', 'crash-whitepaper', 'doc-iana',
'bash-doc', 'apt-howto-common', 'autotools-dev',
- 'aptitude-doc-en', 'armagetron-common', 'asr-manpages',
+ 'aptitude-doc-en', 'asr-manpages',
'atomix-data', 'alcovebook-sgml-doc', 'alamin-doc',
'aegis-doc', 'afbackup-common', 'airstrike-common',
]),
(6, ['update']),
(6, ['install', 'aboot-base', 'aap-doc', 'ada-reference-manual',
- 'aspectj-doc', 'fop-doc', 'jswat-doc', 'asis-doc',
+ 'aspectj-doc', 'fop-doc', 'asis-doc',
'bison-doc', 'crash-whitepaper', 'doc-iana',
'bash-doc', 'apt-howto-common', 'autotools-dev',
- 'aptitude-doc-en', 'armagetron-common', 'asr-manpages',
+ 'aptitude-doc-en', 'asr-manpages',
'atomix-data', 'alcovebook-sgml-doc', 'alamin-doc',
'aegis-doc', 'afbackup-common', 'airstrike-common',
]),
@@ -260,7 +257,6 @@
(1, ['install', 'ada-reference-manual']),
(1, ['install', 'aspectj-doc']),
(1, ['install', 'fop-doc']),
- (1, ['install', 'jswat-doc']),
(1, ['install', 'asis-doc']),
(1, ['install', 'bison-doc']),
(1, ['install', 'crash-whitepaper']),
@@ -577,11 +573,11 @@
# Create apt's config files
f = open(join([downloader_dir, 'etc', 'apt', 'sources.list']), 'w')
if exists('/usr/lib/apt/methods/newdebtorrent'):
- f.write('deb newdebtorrent://localhost:' + str(num_down) + '988/' + mirror + '/ stable ' + suites + '\n')
+ f.write('deb newdebtorrent://localhost:' + str(num_down) + '988/' + mirror + '/ unstable ' + suites + '\n')
elif exists('/usr/lib/apt/methods/debtorrent'):
- f.write('deb debtorrent://localhost:' + str(num_down) + '988/' + mirror + '/ stable ' + suites + '\n')
+ f.write('deb debtorrent://localhost:' + str(num_down) + '988/' + mirror + '/ unstable ' + suites + '\n')
else:
- f.write('deb http://localhost:' + str(num_down) + '988/' + mirror + '/ stable ' + suites + '\n')
+ f.write('deb http://localhost:' + str(num_down) + '988/' + mirror + '/ unstable ' + suites + '\n')
f.close()
if not exists(join([downloader_dir, 'etc', 'apt', 'apt.conf'])):
@@ -772,4 +768,4 @@
else:
print 'Unknown test to run:', sys.argv[1], '\n'
print get_usage()
-
+
More information about the Debtorrent-commits
mailing list