[apt-proxy-devel] r589 - in trunk: apt_proxy
apt_proxy/twisted_compat debian debian/po
Chris Halls
halls at costa.debian.org
Thu Jan 26 12:09:11 UTC 2006
Author: halls
Date: Thu Jan 26 12:09:10 2006
New Revision: 589
Modified:
trunk/apt_proxy/apt_proxy.py
trunk/apt_proxy/misc.py
trunk/apt_proxy/twisted_compat/compat.py
trunk/debian/changelog
trunk/debian/control
trunk/debian/po/ru.po
trunk/debian/rules
Log:
* Update for twisted 2.1.0. Thanks Tuncer Ayazi and Andreas Pakulat for their patches and suggestions.
* Depend on python-twisted-web if using twisted > 2.0.1 (Closes: #349596)
* Remove use of deprecated arm calls (Closes: #349447)
* Rework apt-proxy.conf manpage. Thanks to Roey Katz for all the suggestions
* debian/rules: swap dh_python and dh_installinit calls, so that update-python-modules is called before init script in postinst
Modified: trunk/apt_proxy/apt_proxy.py
==============================================================================
--- trunk/apt_proxy/apt_proxy.py (original)
+++ trunk/apt_proxy/apt_proxy.py Thu Jan 26 12:09:10 2006
@@ -16,7 +16,6 @@
from twisted.internet import reactor, defer, abstract, protocol
from twisted.protocols import ftp, basic
-from twisted.web import static
import os, stat, signal, fcntl, exceptions
from os.path import dirname, basename
@@ -112,7 +111,6 @@
verifier = FileVerifier(self)
verifier.deferred.addCallbacks(callback_if_ok, callback_if_fail)
- verifier.deferred.arm()
then either callback_if_ok or callback_if_fail will be called
when the subprocess finishes execution.
@@ -801,7 +799,6 @@
d = self.ftpclient.queueStringCommand('MDTM ' + self.remote_file)
d.addCallbacks(apFtpMtimeFinish, apFtpMtimeFinish,
(self, 0), None, (self, 1), None)
- d.arm()
def ftpFetchSize(self):
"Get the size of the file from the server"
@@ -819,7 +816,6 @@
d = self.ftpclient.queueStringCommand('SIZE ' + self.remote_file)
d.addCallbacks(apFtpSizeFinish, apFtpSizeFinish,
(self, 0), None, (self, 1), None)
- d.arm()
def ftpFetchList(self):
"If ftpFetchSize didn't work try to get the size with a list command."
@@ -839,7 +835,6 @@
d.addCallbacks(apFtpListFinish, apFtpListFinish,
(filelist, self, 0), None,
(filelist, self, 1), None)
- d.arm()
def ftpFetchFile(self):
"And finally, we ask for the file."
@@ -851,7 +846,6 @@
d.addCallbacks(apFtpFetchFinish, apFtpFetchFinish,
(http.OK, "good", self), None,
(http.NOT_FOUND, "fail", self), None)
- d.arm()
def dataReceived(self, data):
self.setResponseCode(http.OK)
@@ -1486,7 +1480,6 @@
d.addCallbacks(fetch_real, fetch_real,
(dummyFetcher, 1, running,), None,
(dummyFetcher, 0, running,), None)
- d.arm()
return None
def simplify_path(self, old_path):
@@ -1574,7 +1567,6 @@
verifier.deferred.addCallbacks(file_ok, deferred.errback,
(deferred, self), None,
None, None)
- verifier.deferred.arm()
else:
deferred.errback()
return deferred
Modified: trunk/apt_proxy/misc.py
==============================================================================
--- trunk/apt_proxy/misc.py (original)
+++ trunk/apt_proxy/misc.py Thu Jan 26 12:09:10 2006
@@ -76,7 +76,7 @@
"Useful to save typing on new debuging messages"
if self.isEnabled(domain, level):
try:
- python.log.debug("[%s] %s"%(domain, msg))
+ python.log.msg("[%s] %s"%(domain, msg), debug=True)
except IOError:
pass
def err(self, msg, domain='error', level=9):
Modified: trunk/apt_proxy/twisted_compat/compat.py
==============================================================================
--- trunk/apt_proxy/twisted_compat/compat.py (original)
+++ trunk/apt_proxy/twisted_compat/compat.py Thu Jan 26 12:09:10 2006
@@ -2,7 +2,7 @@
#This is a gross hack to get non-released features
update_needed=0
-if copyright.version in ("0.99.2","1.0.0", "1.2.0", "1.3.0rc1", "2.0.1"):
+if copyright.version in ("0.99.2","1.0.0", "1.2.0", "1.3.0rc1", "2.0.1", "2.1.0"):
#print "Updating twisted's process module."
if not update_needed:
pass
Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Thu Jan 26 12:09:10 2006
@@ -1,13 +1,19 @@
-apt-proxy (1.9.32+pre33) UNRELEASED; urgency=low
-
- [ Debconf Translations ]
- * Yuriy Talakan <yt at amur.elektra.ru>: ru.po (closes: #310326)
+apt-proxy (1.9.33) unstable; urgency=low
[ Chris Halls ]
+ * Update for twisted 2.1.0. Thanks Tuncer Ayazi and Andreas Pakulat for
+ their patches and suggestions.
+ * Depend on python-twisted-web if using twisted > 2.0.1 (Closes: #349596)
+ * Remove use of deprecated arm calls (Closes: #349447)
* Rework apt-proxy.conf manpage. Thanks to Roey Katz for all the
suggestions
+ * debian/rules: swap dh_python and dh_installinit calls, so that
+ update-python-modules is called before init script in postinst
+
+ [ Debconf Translations ]
+ * Yuriy Talakan <yt at amur.elektra.ru>: ru.po (closes: #310326)
- -- Chris Halls <halls at debian.org> Thu, 5 Jan 2006 18:26:44 +0000
+ -- Chris Halls <halls at debian.org> Thu, 26 Jan 2006 11:59:56 +0000
apt-proxy (1.9.32) unstable; urgency=low
Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control (original)
+++ trunk/debian/control Thu Jan 26 12:09:10 2006
@@ -8,7 +8,7 @@
Package: apt-proxy
Architecture: all
-Depends: debconf (>= 0.5.00) | debconf-2.0, ${python:Depends}, python-twisted (>= 1.3.0-7) | python2.3 (<< 2.3.5-1), python-twisted (>= 1.0.0), python-apt (>= 0.5.8), python-bsddb3, bzip2, logrotate, adduser
+Depends: debconf (>= 0.5.00) | debconf-2.0, ${python:Depends}, python-twisted (>= 1.3.0-7) | python2.3 (<< 2.3.5-1), python-twisted (>= 1.0.0), python-twisted-web | python-twisted (<< 2.1.0) python-apt (>= 0.5.8), python-bsddb3, bzip2, logrotate, adduser
Conflicts: apt-proxy-v2 (<= 1.9.5)
Replaces: apt-proxy-v2 (<= 1.9.5)
Suggests: rsync
Modified: trunk/debian/po/ru.po
==============================================================================
--- trunk/debian/po/ru.po (original)
+++ trunk/debian/po/ru.po Thu Jan 26 12:09:10 2006
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: apt-proxy_1.9.30_ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-16 10:00-0300\n"
+"POT-Creation-Date: 2005-08-18 12:19-0300\n"
"PO-Revision-Date: 2005-05-23 14:41+1000\n"
"Last-Translator: Yuriy Talakan' <yt at amur.elektra.ru>\n"
"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -23,7 +23,8 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.9.1\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#. Type: note
#. Description
@@ -44,21 +45,28 @@
"apt-proxy has been rewritten in python and the new configuration file format "
"is incompatible with previous version. Hopefully you will like the new "
"format better :)"
-msgstr "apt-proxy был переписан на python и формат нового файла конфигурации несовместим с предыдущей версией. Недеемся, вам понравится новый формат :)"
+msgstr ""
+"apt-proxy был переписан на python и формат нового файла конфигурации "
+"несовместим с предыдущей версией. Недеемся, вам понравится новый формат :)"
#. Type: note
#. Description
#: ../templates:3
+#, fuzzy
msgid ""
"I will build /etc/apt-proxy/apt-proxy-v2.conf based on your old settings if "
-"you did't already have such file. In any case, a backup file will be written "
-"to /etc/apt-proxy/apt-proxy-v2.conf.backup"
-msgstr "Я создам /etc/apt-proxy/apt-proxy-v2.conf на основе ваши старых настроек, если у вас его еще нет. В любом случае, запасной файл будет сохранен в /etc/apt-proxy/apt-proxy-v2.conf.backup"
+"you didn't already have such file. In any case, a backup file will be "
+"written to /etc/apt-proxy/apt-proxy-v2.conf.backup"
+msgstr ""
+"Я создам /etc/apt-proxy/apt-proxy-v2.conf на основе ваши старых настроек, "
+"если у вас его еще нет. В любом случае, запасной файл будет сохранен в /etc/"
+"apt-proxy/apt-proxy-v2.conf.backup"
#. Type: note
#. Description
#: ../templates:3
-msgid "There are also other issues documented in /usr/share/doc/apt-proxy/UPGRADING"
+msgid ""
+"There are also other issues documented in /usr/share/doc/apt-proxy/UPGRADING"
msgstr "Остальные детали описаны в /usr/share/doc/apt-proxy/UPGRADING"
#. Type: note
@@ -74,8 +82,8 @@
"The upgrading script dumped some warnings and they have been mailed to "
"root at localhost."
msgstr ""
-"Сценарий обновления сохранил некоторые предупреждения и отправил их на"
-"root at localhost."
+"Сценарий обновления сохранил некоторые предупреждения и отправил их "
+"наroot at localhost."
#. Type: note
#. Description
@@ -83,5 +91,7 @@
msgid ""
"You should read those warnings and /usr/share/doc/apt-proxy/UPGRADING and "
"revise your configuration (/etc/apt-proxy/apt-proxy-v2.conf)"
-msgstr "Вы должны прочитать эти предупреждения и /usr/share/doc/apt-proxy/UPGRADING, а затем пересмотреть свои настройки (/etc/apt-proxy/apt-proxy-v2.conf)"
-
+msgstr ""
+"Вы должны прочитать эти предупреждения и /usr/share/doc/apt-proxy/"
+"UPGRADING, а затем пересмотреть свои настройки (/etc/apt-proxy/apt-proxy-v2."
+"conf)"
Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Thu Jan 26 12:09:10 2006
@@ -34,8 +34,8 @@
dh_installman
dh_installchangelogs
dh_installlogrotate
- dh_installinit
dh_python
+ dh_installinit
#install -g root -o root -m 755 \
# apt-proxy debian/apt-proxy/usr/sbin/apt-proxy
More information about the apt-proxy-devel
mailing list