]> git.ipfire.org Git - pakfire.git/commitdiff
Display generated packages at the end of the build.
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 24 Sep 2011 15:18:59 +0000 (17:18 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 24 Sep 2011 15:18:59 +0000 (17:18 +0200)
pakfire/builder.py
pakfire/packages/make.py
pakfire/packages/packager.py

index 15786d214f16a328c7bafc7d9c78eaaa3b230368..0149e797f08609c776748e9d6ee0e20c09739ea3 100644 (file)
@@ -590,6 +590,7 @@ class BuildEnviron(object):
                finally:
                        self._umountall()
 
+
 class Builder(object):
        def __init__(self, pakfire, filename, resultdir, **kwargs):
                self.pakfire = pakfire
@@ -697,10 +698,18 @@ class Builder(object):
                # Package the result.
                # Make all these little package from the build environment.
                logging.info(_("Creating packages:"))
+               pkgs = []
                for pkg in reversed(self.pkg.packages):
                        packager = packages.packager.BinaryPackager(self.pakfire, pkg,
                                self, self.buildroot)
-                       packager.run(self.resultdir)
+                       pkg = packager.run(self.resultdir)
+                       pkgs.append(pkg)
+               logging.info("")
+
+               for pkg in sorted(pkgs):
+                       for line in pkg.dump(long=True).splitlines():
+                               logging.info(line)
+                       logging.info("")
                logging.info("")
 
        def build_stage(self, stage):
index b73aa5a93ae7e5e4a938b29e32006190a703c7b8..66cc0bf021868d386e5f9a1e5c638b7c0fbceace 100644 (file)
@@ -377,6 +377,10 @@ class Makefile(MakefileBase):
                                
                        shutil.copy2(_filename, filename)
 
+       @property
+       def inst_size(self):
+               return 0
+
 
 class MakefilePackage(MakefileBase):
        def __init__(self, pakfire, name, lexer):
index dd45c8ff4b726195ebc1326a0e02da6c50d124d6..16ed55fe864b27608b65e5775143e7ddfd49148b 100644 (file)
@@ -536,6 +536,8 @@ class BinaryPackager(Packager):
                except OSError:
                        shutil.copy2(tempfile, resultfile)
 
+               return BinaryPackage(self.pakfire, self.pakfire.repos.dummy, resultfile)
+
 
 class SourcePackager(Packager):
        def create_metafile(self, datafile):
@@ -592,7 +594,7 @@ class SourcePackager(Packager):
                        datafile.add(file, "files/%s" % os.path.basename(file))
 
                # Add all files in the package directory.
-               for file in self.pkg.files:
+               for file in sorted(self.pkg.files):
                        arcname = os.path.relpath(file, self.pkg.path)
                        datafile.add(file, arcname)