Merge branch 'signatures'

Conflicts:
	po/pakfire.pot

diff --cc python/pakfire/api.py
Simple merge

diff --cc python/pakfire/base.py
index ee9f6857c28772038484724c8ab9c75a43661d1d,d193102f35e2046a6482f090be35c22ff98d28ee..73cf237c84df12324852012f10f29eb3072941a6
--- 1/python/pakfire/base.py
--- 2/python/pakfire/base.py
+++ b/python/pakfire/base.py
@@@ -25,8 -25,10 +25,9 @@@ import strin
  
  import actions
  import builder
 -import config
  import distro
  import filelist
+ import keyring
  import logger
  import packages
  import repository
@@@ -75,23 -74,24 +76,26 @@@ class Pakfire(object)
                        if self.path == "/":
                                self.check_is_ipfire()
  
 -              # Read configuration file(s)
 -              self.config = config.Config(type=mode)
 -              for filename in configs:
 -                      self.config.read(filename)
 -              # Assume, that all other keyword arguments are configuration
 -              # parameters.
 -              self.config.update(kwargs)
 +              # Get the configuration.
 +              if config:
 +                      assert configs is None, "You cannot pass configs and config."
 +                      self.config = config
 +              else:
 +                      # Read configuration file(s).
 +                      self.config = Config(files=configs)
  
 -              # Setup the logger
 -              logger.setup_logging(self.config)
 +              # Dump the configuration.
                self.config.dump()
  
+               # Initialize the keyring.
+               self.keyring = keyring.Keyring(self)
+ 
                # Get more information about the distribution we are running
                # or building
 -              self.distro = distro.Distribution(self, distro_config)
 +              self.distro = distro.Distribution(self)
 +              if arch:
 +                      self.distro.arch = arch
 +
                self.pool   = satsolver.Pool(self.distro.arch)
                self.repos  = repository.Repositories(self,
                        enable_repos=enable_repos, disable_repos=disable_repos)

diff --cc python/pakfire/cli.py
index c2e2dfb38cc97de5793fa36d1054ca4e8bada0a5,a96c3b86c97593822b92442717d1d49b20f4c381..df8cb061944d351bdc09ef293cfcfe1678bc6f28
--- 1/python/pakfire/cli.py
--- 2/python/pakfire/cli.py
+++ b/python/pakfire/cli.py
@@@ -20,10 -20,9 +20,11 @@@
  ###############################################################################
  
  import argparse
+ import datetime
  import os
 +import shutil
  import sys
 +import tempfile
  
  import pakfire.api as pakfire
  

diff --cc python/pakfire/constants.py
index 2c091e42f9f8ff4de6dd41af3df88c7273eaf8dc,7567185c5a9cc78e3477d3c6fe8b2040d7805988..caa6c100252c7fe741444a927722eda43ffbc3f8
--- 1/python/pakfire/constants.py
--- 2/python/pakfire/constants.py
+++ b/python/pakfire/constants.py
@@@ -33,10 -30,12 +33,12 @@@ PAKFIRE_HUB = "https://pakfirehub.ipfir
  SYSCONFDIR = "/etc"
  SCRIPT_DIR = "/usr/lib/pakfire"
  
 -CONFIG_DIR = os.path.join(SYSCONFDIR, "pakfire.repos.d")
 -CONFIG_DIR_EXT = ".repo"
 -CONFIG_FILE = os.path.join(SYSCONFDIR, "pakfire.conf")
 +CONFIG_DIR = os.path.join(SYSCONFDIR, "pakfire")
 +CONFIG_REPOS_DIR = os.path.join(CONFIG_DIR, "repos")
 +CONFIG_DISTRO_DIR = os.path.join(CONFIG_DIR, "distros")
  
+ KEYRING_DIR = os.path.join(SYSCONFDIR, "pakfire.d", "gnupg")
+ 
  CACHE_DIR = "/var/cache/pakfire"
  CCACHE_CACHE_DIR = os.path.join(CACHE_DIR, "ccache")
  CACHE_ENVIRON_DIR = os.path.join(CACHE_DIR, "environments")

diff --cc python/pakfire/repository/index.py
index ef0d9dfedea5a153b0ca75d0349a7c79f58c4223,9dda6bb96180447e1b2781496e04147ea1352a06..ec60f5d6b0716f0a3626dc41ccaf1a8b20a38e01
--- 1/python/pakfire/repository/index.py
--- 2/python/pakfire/repository/index.py
+++ b/python/pakfire/repository/index.py
@@@ -52,13 -52,6 +52,10 @@@ class Index(object)
        def __repr__(self):
                return "<%s %s>" % (self.__class__.__name__, self.repo)
  
-       def __len(self):
-               return len(self.repo)
- 
 +      @property
 +      def distro(self):
 +              return self.repo.distro
 +
        @property
        def cache(self):
                return self.repo.cache

diff --cc python/pakfire/repository/local.py
Simple merge