import chroot
import logger
import packages
+import packages.packager
import repository
import util
# Make all these little package from the build environment.
for pkg in reversed(self.pkg.packages):
- packager = packages.BinaryPackager(self.pakfire, pkg, self)
+ packager = packages.packager.BinaryPackager(self.pakfire, pkg, self)
packager.run([repo.path,])
self.log.info("")
# Make all these little package from the build environment.
logging.info(_("Creating packages:"))
for pkg in reversed(self.pkg.packages):
- packager = packages.BinaryPackager(self.pakfire, pkg, self.buildroot)
+ packager = packages.packager.BinaryPackager(self.pakfire, pkg, self.buildroot)
packager.run([self.resultdir,])
logging.info("")
import tarfile
-from binary import BinaryPackage
-from file import InnerTarFile
+from file import BinaryPackage, InnerTarFile, SourcePackage
from installed import DatabasePackage, InstalledPackage
from solv import SolvPackage
-from source import SourcePackage
from make import Makefile
-from packager import BinaryPackager
from pakfire.constants import *
+++ /dev/null
-#!/usr/bin/python
-###############################################################################
-# #
-# Pakfire - The IPFire package management system #
-# Copyright (C) 2011 Pakfire development team #
-# #
-# This program 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 3 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, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-from file import FilePackage
-
-class BinaryPackage(FilePackage):
- def get_scriptlet(self, type):
- a = self.open_archive()
-
- # Path of the scriptlet in the tarball.
- path = "scriptlets/%s" % type
-
- try:
- f = a.extractfile(path)
- except KeyError:
- # If the scriptlet is not available, we just return.
- return
-
- scriptlet = f.read()
-
- f.close()
- a.close()
-
- return scriptlet
return []
return conflicts.split()
+
+
+class SourcePackage(FilePackage):
+ pass
+
+
+class BinaryPackage(FilePackage):
+ def get_scriptlet(self, type):
+ a = self.open_archive()
+
+ # Path of the scriptlet in the tarball.
+ path = "scriptlets/%s" % type
+
+ try:
+ f = a.extractfile(path)
+ except KeyError:
+ # If the scriptlet is not available, we just return.
+ return
+
+ scriptlet = f.read()
+
+ f.close()
+ a.close()
+
+ return scriptlet
import pakfire.downloader
from base import Package
-from binary import BinaryPackage
+from file import BinaryPackage
import pakfire.util as util
from pakfire.constants import *
import pakfire.util as util
from base import Package
-from source import SourcePackage
+from file import SourcePackage
+
from pakfire.constants import *
from pakfire.i18n import _
import pakfire.compress
import pakfire.util as util
-from pakfire.util import rm
from pakfire.constants import *
from pakfire.i18n import _
-from binary import BinaryPackage
-from source import SourcePackage
-from file import InnerTarFile
+from file import BinaryPackage, InnerTarFile, SourcePackage
class Packager(object):
def __init__(self, pakfire, pkg):
import re
import base
-import binary
+import file
class SolvPackage(base.Package):
def __init__(self, pakfire, solvable, repo=None):
path = os.path.join(self.repo.path, i, self.filename)
if os.path.exists(path):
- return binary.BinaryPackage(self.pakfire, self.repo, path)
+ return file.BinaryPackage(self.pakfire, self.repo, path)
else:
filename = "packages/%s" % self.filename
path = self.repo.cache.abspath(filename)
if path:
- return binary.BinaryPackage(self.pakfire, self.repo, path)
+ return file.BinaryPackage(self.pakfire, self.repo, path)
def download(self, text=""):
if not self.repo.local:
+++ /dev/null
-#!/usr/bin/python
-###############################################################################
-# #
-# Pakfire - The IPFire package management system #
-# Copyright (C) 2011 Pakfire development team #
-# #
-# This program 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 3 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, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-from file import FilePackage
-
-class SourcePackage(FilePackage):
- pass
widgets = [
" ",
- "%-40s" % message,
+ "%s" % message,
" ",
Bar(left="[", right="]"),
" ",
pakfire/__init__.py
pakfire/logger.py
pakfire/packages/base.py
-pakfire/packages/binary.py
pakfire/packages/file.py
pakfire/packages/__init__.py
pakfire/packages/installed.py
pakfire/packages/make.py
pakfire/packages/packager.py
pakfire/packages/solv.py
-pakfire/packages/source.py
pakfire/repository/base.py
pakfire/repository/cache.py
pakfire/repository/database.py
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 20:53+0200\n"
+"POT-Creation-Date: 2011-08-28 14:33+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgid "Everything is fine."
msgstr ""
-#: ../pakfire/builder.py:122
+#: ../pakfire/builder.py:123
msgid "Package information:"
msgstr ""
#. Copy the makefile and load source tarballs.
-#: ../pakfire/builder.py:306
+#: ../pakfire/builder.py:307
msgid "Extracting"
msgstr ""
-#: ../pakfire/builder.py:614
+#: ../pakfire/builder.py:615
msgid "Dumping created packages"
msgstr ""
-#: ../pakfire/builder.py:636
+#: ../pakfire/builder.py:637
msgid "The build command failed. See logfile for details."
msgstr ""
#. Package the result.
#. Make all these little package from the build environment.
-#: ../pakfire/builder.py:778
+#: ../pakfire/builder.py:779
msgid "Creating packages:"
msgstr ""
#. Execute the buildscript of this stage.
-#: ../pakfire/builder.py:789
+#: ../pakfire/builder.py:790
#, python-format
msgid "Running stage %s:"
msgstr ""
msgid "Filename: %s"
msgstr ""
-#: ../pakfire/packages/make.py:98
+#: ../pakfire/packages/make.py:99
msgid "Package name is undefined."
msgstr ""
-#: ../pakfire/packages/make.py:101
+#: ../pakfire/packages/make.py:102
msgid "Package version is undefined."
msgstr ""
#. Load progressbar.
-#: ../pakfire/packages/packager.py:309
+#: ../pakfire/packages/packager.py:306
msgid "Packaging"
msgstr ""
-#: ../pakfire/packages/packager.py:602
+#: ../pakfire/packages/packager.py:599
#, python-format
msgid "Building source package %s:"
msgstr ""
msgstr ""
#: ../scripts/pakfire:25
-msgid "Please your installation of Pakfire."
+msgid "Please check your installation of Pakfire."
msgstr ""
#: ../scripts/pakfire:27
--- /dev/null
+pakfire
\ No newline at end of file