aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Krytarik Raido <krytarik@tuxgarage.com>2018-03-18 21:34:04 +0100
committerLibravatar Krytarik Raido <krytarik@tuxgarage.com>2018-04-03 06:50:04 +0200
commit11bda2c49979375ab7cdea5deac04f4bcb2a5dae (patch)
tree49cd337a5895e3c1c496f0bf2b42861161480e2e
parentdc580be8f9ef38a1c0903820b04e1b5c7217da16 (diff)
downloadmini-dinstall-11bda2c49979375ab7cdea5deac04f4bcb2a5dae.tar.bz2
mini-dinstall-11bda2c49979375ab7cdea5deac04f4bcb2a5dae.tar.xz
mini-dinstall-11bda2c49979375ab7cdea5deac04f4bcb2a5dae.tar.zst
Drop unused files and code.
-rwxr-xr-xmini-dinstall33
-rw-r--r--minidinstall/OrderedDict.py75
2 files changed, 0 insertions, 108 deletions
diff --git a/mini-dinstall b/mini-dinstall
index 92db848..8d53edc 100755
--- a/mini-dinstall
+++ b/mini-dinstall
@@ -23,7 +23,6 @@
import os, sys, re, glob, getopt, time, traceback, lzma, getpass, socket
import shutil, threading, select, queue, socketserver, datetime
import logging, logging.handlers
-#logging.basicConfig()
import apt_pkg
apt_pkg.init()
from configparser import *
@@ -435,34 +434,6 @@ for dist in list(distributions.keys()):
logger.debug("Distributions: %s" % distributions)
-# class DinstallTransaction:
-# def __init__(self, dir):
-# self._dir = dir
-
-# def start(self, pkgname):
-# self._pkgname = pkgname
-# self._transfilename = os.path.join(dir, pkgname + ".transaction")
-
-# def _log_op(self, type, state, str):
-# tmpfile = self._transfilename + ".tmp"
-# if (os.access(self._transfilename), os.R_OK):
-# shutil.copyFile(self._transfilename, tmpfile)
-# f = open(tmpfile, 'w')
-# f.write('%s %s' % (type, str) )
-# f.close()
-
-# def _start_op(self, type, str):
-# self._log_op(type, 'start', str)
-
-# def _stop_op(self, type, str):
-# self._log_op(type, 'stop', str)
-
-# def renameFile(self, source, dst):
-# self._start_op('rename',
-
-# def _sync():
-# os.system("sync")
-
os.chdir(toplevel_directory)
do_mkdir(dinstall_subdir)
rejectdir = os.path.join(dinstall_subdir, 'REJECT')
@@ -774,9 +745,6 @@ class ArchiveDir:
self._success_logger.addHandler(self.mailHandler)
self._clean_targets = []
-# self._filerefmap = {}
-# self._changefiles = []
-
def _abspath(self, *args):
return os.path.abspath(os.path.join(*[self._dir] + list(args)))
@@ -1659,7 +1627,6 @@ else:
logger.info('Die event caught; waiting for archive %s to finish' % archive.getName())
archive.wait()
-#logging.shutdown()
logger.debug('Removing lock file: %s' % lockfilename)
os.unlink(lockfilename)
logger.info("main thread exiting...")
diff --git a/minidinstall/OrderedDict.py b/minidinstall/OrderedDict.py
deleted file mode 100644
index dab57db..0000000
--- a/minidinstall/OrderedDict.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# OrderedDict -*- mode: python; coding: utf-8 -*-
-#
-# This class functions almost exactly like UserDict. However, when using
-# the sequence methods, it returns items in the same order in which they
-# were added, instead of some random order.
-#
-# Copyright (c) 2001 Adam Heath <doogie@debian.org>
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-from collections import UserDict
-
-class OrderedDict(UserDict):
- __order=[]
-
- def __init__(self, dict=None):
- UserDict.__init__(self)
- self.__order=[]
- if dict and dict.__class__:
- self.update(dict)
-
- def __cmp__(self, dict):
- if isinstance(dict, OrderedDict):
- ret=cmp(self.__order, dict.__order)
- if not ret:
- ret=UserDict.__cmp__(self, dict)
- return ret
- else:
- return UserDict.__cmp__(self, dict)
-
- def __setitem__(self, key, value):
- if key not in self:
- self.__order.append(key)
- UserDict.__setitem__(self, key, value)
-
- def __delitem__(self, key):
- if key in self:
- del self.__order[self.__order.index(key)]
- UserDict.__delitem__(self, key)
-
- def clear(self):
- self.__order=[]
- UserDict.clear(self)
-
- def copy(self):
- if self.__class__ is OrderedDict:
- return OrderedDict(self)
- return self.copy()
-
- def keys(self):
- return self.__order
-
- def items(self):
- return list(map(lambda x, self=self: (x, self.__getitem__(x)), self.__order))
-
- def values(self):
- return list(map(lambda x, self=self: self.__getitem__(x), self.__order))
-
- def update(self, dict):
- for (k, v) in list(dict.items()):
- self.__setitem__(k, v)
-
-# vim:ts=4:sw=4:et: