r381 - in /debtorrent/trunk: DebTorrent/BT1/makemetafile.py DebTorrent/download_bt1.py debian/changelog debian/debtorrent-client.sgml debtorrent-client.conf test.py
camrdale-guest at users.alioth.debian.org
camrdale-guest at users.alioth.debian.org
Thu Jun 19 22:40:22 UTC 2008
Author: camrdale-guest
Date: Thu Jun 19 22:40:22 2008
New Revision: 381
URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=381
Log:
Make the pieces and unique piece number locations config options,
and use the new ones at merkel.debian.org/~camrdale/.
Modified:
debtorrent/trunk/DebTorrent/BT1/makemetafile.py
debtorrent/trunk/DebTorrent/download_bt1.py
debtorrent/trunk/debian/changelog
debtorrent/trunk/debian/debtorrent-client.sgml
debtorrent/trunk/debtorrent-client.conf
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=381&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/BT1/makemetafile.py (original)
+++ debtorrent/trunk/DebTorrent/BT1/makemetafile.py Thu Jun 19 22:40:22 2008
@@ -726,10 +726,16 @@
url = url[:-3]
if url.endswith('.bz2'):
url = url[:-4]
- self.subpieces_url = 'merkel.debian.org/~ajt/extrapieces/' + url + '-extrapieces.gz'
+ self.subpieces_url = self.config['pieces_url']
+ if not self.subpieces_url.endswith('/'):
+ self.subpieces_url += '/'
+ self.subpieces_url += url + '-extrapieces.gz'
self.download.append('subpieces')
if self.config['separate_all']:
- self.torrent_url = 'debian.camrdale.org/debtorrent/' + url + '-torrent.gz'
+ self.torrent_url = self.config['long_lived_torrent_url']
+ if not self.torrent_url.endswith('/'):
+ self.torrent_url += '/'
+ self.torrent_url += url + '-torrent.gz'
self.download.append('torrent')
if self.config['separate_all'] in [1, 3]:
self.torrent_all_url = convert_all(self.torrent_url)
Modified: debtorrent/trunk/DebTorrent/download_bt1.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/download_bt1.py?rev=381&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/download_bt1.py (original)
+++ debtorrent/trunk/DebTorrent/download_bt1.py Thu Jun 19 22:40:22 2008
@@ -143,14 +143,19 @@
'file contains IP range data in the format: xxx:xxx:ip1-ip2'),
('parse_ip_files', 60,
'seconds between reloading of allowed_ips and banned_ips lists for apt'),
- # Backup HTTP Downloader
+ # Other Things
('disable_http_downloader', 0,
'(for testing purposes only) whether to disable the backup HTTP downloader'),
- # Other Things
('separate_all', 3, 'whether to separate the architecture:all packages, ' +
'0 = don\'t separate, 1 = separate and run architecture:all, ' +
'2 = separate and run all architectures but all, ' +
'3 = separate and run both'),
+ ('pieces_url', 'merkel.debian.org/~camrdale/extrapieces/',
+ 'the remote URL to use to fetch information on the splitting of ' +
+ 'large packages into pieces'),
+ ('long_lived_torrent_url', 'merkel.debian.org/~camrdale/uniquepieces/',
+ 'the remote URL to use to fetch information on creating a long-lived ' +
+ 'torrent for testing or unstable using unique piece numbers'),
# End of Normal Options
# BitTorrent Options
('keepalive_interval', 120.0,
Modified: debtorrent/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/changelog?rev=381&op=diff
==============================================================================
--- debtorrent/trunk/debian/changelog (original)
+++ debtorrent/trunk/debian/changelog Thu Jun 19 22:40:22 2008
@@ -4,8 +4,10 @@
rather than the info hash (Closes: #465339)
* Add support for the new No Content message to apt-transport-debtorrent
so that apt treats debtorrent sources as local
+ * Make the pieces and unique piece number locations config options,
+ and use the new ones at merkel.debian.org/~camrdale/.
- -- Cameron Dale <camrdale at gmail.com> Sun, 04 May 2008 18:28:53 -0700
+ -- Cameron Dale <camrdale at gmail.com> Thu, 19 Jun 2008 15:25:05 -0700
debtorrent (0.1.6) experimental; urgency=low
Modified: debtorrent/trunk/debian/debtorrent-client.sgml
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/debtorrent-client.sgml?rev=381&op=diff
==============================================================================
--- debtorrent/trunk/debian/debtorrent-client.sgml (original)
+++ debtorrent/trunk/debian/debtorrent-client.sgml Thu Jun 19 22:40:22 2008
@@ -360,7 +360,7 @@
</refsect2>
<refsect2>
- <title>BACKUP HTTP DOWNLOADER</title>
+ <title>OTHER THINGS</title>
<variablelist>
<varlistentry>
<term><option>--disable_http_downloader</option> 0|1</term>
@@ -368,17 +368,24 @@
<para>whether to disable the backup HTTP downloader, WARNING: for testing purposes only (defaults to 0)</para>
</listitem>
</varlistentry>
- </variablelist>
- </refsect2>
-
- <refsect2>
- <title>OTHER THINGS</title>
- <variablelist>
<varlistentry>
<term><option>--separate_all</option> 0|1|2|3</term>
<listitem>
<para>whether to separate the architecture:all packages into a separate torrent, 0 = don't separate, 1 = separate, run
architecture:all, 2 = separate, run non-architecture:all torrent, 3 = separate, run both</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--pieces_url <replaceable>URL</replaceable></option></term>
+ <listitem>
+ <para>the remote <replaceable>URL</replaceable> to use to fetch information on the splitting of large packages into pieces</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--long_lived_torrent_url <replaceable>URL</replaceable></option></term>
+ <listitem>
+ <para>the remote <replaceable>URL</replaceable> to use to fetch information on creating a long-lived torrent
+ for testing or unstable using unique piece numbers</para>
</listitem>
</varlistentry>
</variablelist>
Modified: debtorrent/trunk/debtorrent-client.conf
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debtorrent-client.conf?rev=381&op=diff
==============================================================================
--- debtorrent/trunk/debtorrent-client.conf (original)
+++ debtorrent/trunk/debtorrent-client.conf Thu Jun 19 22:40:22 2008
@@ -431,7 +431,7 @@
# parse_ip_files = 60
###############################################################################
-# B A C K U P H T T P D O W N L O A D E R
+# O T H E R T H I N G S
###############################################################################
#
# Disable HTTP Downloader
@@ -444,9 +444,6 @@
# disable_http_downloader = 0
-###############################################################################
-# O T H E R T H I N G S
-###############################################################################
#
# Separate All
#
@@ -467,6 +464,25 @@
# separate_all = 3
+#
+# Pieces URL
+#
+# The remote URL to use to fetch information on the splitting of large packages
+# into pieces. This is probably only useful to users of non-Debian systems.
+#
+
+# pieces_url = merkel.debian.org/~camrdale/extrapieces/
+
+#
+# Long-lived Torrent URL
+#
+# The remote URL to use to fetch information on creating a long-lived torrent
+# for testing or unstable using unique piece numbers. This is probably only
+# useful to users of non-Debian systems.
+#
+
+# long_lived_torrent_url = merkel.debian.org/~camrdale/uniquepieces/
+
###############################################################################
# E N D O F N O R M A L O P T I O N S
###############################################################################
Modified: debtorrent/trunk/test.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/test.py?rev=381&op=diff
==============================================================================
--- debtorrent/trunk/test.py (original)
+++ debtorrent/trunk/test.py Thu Jun 19 22:40:22 2008
@@ -311,7 +311,7 @@
// The timeout delay before the method will close the connection
Timeout "300";
// Don't keep copies of the downloaded files in apt's cache
- NoCache "true";
+ NoCache "false";
};
};
@@ -573,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'])):
More information about the Debtorrent-commits
mailing list