diff options
Diffstat (limited to 'mini-dinstall')
| -rwxr-xr-x | mini-dinstall | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/mini-dinstall b/mini-dinstall index 5910cff..8430962 100755 --- a/mini-dinstall +++ b/mini-dinstall @@ -18,7 +18,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -import os, sys, re, glob, getopt, time, traceback, gzip, lzma, getpass, socket +import os, sys, re, glob, getopt, time, traceback, lzma, getpass, socket import shutil, signal, threading, select, Queue, SocketServer import logging, logging.handlers #logging.basicConfig() @@ -1145,17 +1145,13 @@ class ArchiveDirIndexer(threading.Thread): stdout = os.fdopen(infd) packagesfilename = os.path.join(dir, name) newpackagesfilename = packagesfilename + '.new' - zpackagesfilename = packagesfilename + '.gz' xzpackagesfilename = packagesfilename + '.xz' - newzpackagesfilename = newpackagesfilename + '.gz' newxzpackagesfilename = newpackagesfilename + '.xz' newpackagesfile = open(newpackagesfilename, 'w') - newzpackagesfile = gzip.GzipFile(newzpackagesfilename, 'w') newxzpackagesfile = lzma.LZMAFile(newxzpackagesfilename, 'w') buf = stdout.read(8192) while buf != '': newpackagesfile.write(buf) - newzpackagesfile.write(buf) newxzpackagesfile.write(buf) buf = stdout.read(8192) stdout.close() @@ -1163,10 +1159,8 @@ class ArchiveDirIndexer(threading.Thread): if not (status is None or (os.WIFEXITED(status) and os.WEXITSTATUS(status) == 0)): raise DinstallException("apt-ftparchive exited with status code %d" % (status,)) newpackagesfile.close() - newzpackagesfile.close() newxzpackagesfile.close() shutil.move(newpackagesfilename, packagesfilename) - shutil.move(newzpackagesfilename, zpackagesfilename) shutil.move(newxzpackagesfilename, xzpackagesfilename) def _make_packagesfile(self, dir): @@ -1384,7 +1378,7 @@ class SimpleSubdirArchiveDirIndexer(ArchiveDirIndexer): release_needed = 0 uncompr_indexfile = os.path.join(arch, 'Packages') indexfiles = [uncompr_indexfile] - comprexts = ['.gz', '.xz'] + comprexts = ['.xz'] for ext in comprexts: indexfiles = indexfiles + [uncompr_indexfile + ext] if os.access(targetname, os.R_OK): @@ -1472,7 +1466,7 @@ class FlatArchiveDirIndexer(ArchiveDirIndexer): release_needed = 0 uncompr_indexfiles = self._get_all_indexfiles() indexfiles = [] - comprexts = ['.gz', '.xz'] + comprexts = ['.xz'] for index in uncompr_indexfiles: indexfiles = indexfiles + [index] for ext in comprexts: |