← Back to branch summary

~flexiondotorg/aptdaemon/aptdaemon-lp1623856

« back to all changes in this revision

Viewing changes to aptdaemon/core.py

  • Committer: Sebastian Heinlein
  • Date: 2013-07-22 10:25:25 UTC
  • mto: This revision was merged to the branch mainline in revision 957.
  • Revision ID: devel@glatzor.de-20130722102525-hrpr7qysvt8gfz68
Start moving the pk worker to a separate module and removing all apt bits
from the core and pk layer

Show diffs side-by-side

added added

removed removed

Lines of Context:
aptdaemon/core.py
63
63
from defer import inline_callbacks, return_value, Deferred
64
64
from defer.utils import dbus_deferred_method
65
65
from . import policykit1
66
 
from .worker import (
67
 
    AptWorker,
68
 
    DummyWorker,
69
 
    trans_only_installs_pkgs_from_high_trust_repos)
 
66
from .utils import split_package_id
 
67
from .worker import DummyWorker
 
68
from .worker.aptworker import (AptWorker,
 
69
                               trans_only_installs_pkgs_from_high_trust_repos)
70
70
from .loop import mainloop
71
71
from .logger import ColoredFormatter
72
72
 
1460
1460
        else:
1461
1461
            load_plugins = not options.disable_plugins
1462
1462
            try:
 
1463
                from .worker.pkworker import PackageKitWorker
1463
1464
                from . import pkcompat
1464
 
            except ImportError:
 
1465
            except NotImplementedError: #ImportError:
1465
1466
                self.worker = AptWorker(options.chroot, load_plugins)
1466
1467
            else:
1467
 
                self.worker = pkcompat.PackageKitWorker(options.chroot,
1468
 
                                                        load_plugins)
 
1468
                self.worker = PackageKitWorker(options.chroot,
 
1469
                                               load_plugins)
1469
1470
        self.queue = TransactionQueue(self.worker)
1470
1471
        self.queue.connect("queue-changed", self._on_queue_changed)
1471
1472
        # keep state of the last information about reboot required
2087
2088
        exception.
2088
2089
        """
2089
2090
        for fullname in pkg_names:
2090
 
            name, version, release = AptWorker._split_package_id(fullname)
 
2091
            name, version, release = split_package_id(fullname)
2091
2092
            if not re.match(REGEX_VALID_PACKAGENAME, name):
2092
2093
                raise errors.AptDaemonError("%s isn't a valid package name" %
2093
2094
                                            name)