diff treepkg/packager.py @ 49:38d66dc6a1e5

merge
author Bernhard Herzog <bh@intevation.de>
date Mon, 02 Apr 2007 20:48:25 +0200
parents 2802be410156 f7ec40638a06
children e1028211d34b 78cf5f6778ec
line wrap: on
line diff
--- a/treepkg/packager.py	Mon Apr 02 20:47:25 2007 +0200
+++ b/treepkg/packager.py	Mon Apr 02 20:48:25 2007 +0200
@@ -154,9 +154,9 @@
         """
         util.ensure_directory(self.work_dir)
         try:
-            self.status.status = "creating_source_package"
+            self.status.creating_source_package()
             self.do_package()
-            self.status.status = "source_package_created"
+            self.status.source_package_created()
         finally:
             logging.info("Removing workdir %r", self.work_dir)
             shutil.rmtree(self.work_dir)
@@ -182,7 +182,7 @@
         self.logfile = logfile
 
     def package(self):
-        self.status.status = "creating_binary_package"
+        self.status.creating_binary_package()
         util.ensure_directory(self.binary_dir)
         logging.info("Building binary package; loging to %r", self.logfile)
         cmd = ["/usr/sbin/pbuilder", "build",
@@ -190,7 +190,7 @@
                "--logfile", self.logfile,
                "--buildresult", self.binary_dir, self.dsc_file]
         run.call(self.pkg_line.root_cmd + cmd, suppress_output=True)
-        self.status.status = "binary_package_created"
+        self.status.binary_package_created()
 
 
 class RevisionPackager(object):
@@ -202,11 +202,13 @@
         self.pkg_line = pkg_line
         self.revision = revision
         self.base_dir = self.pkg_line.pkg_dir_for_revision(self.revision, 1)
-        self.status = status.Status(os.path.join(self.base_dir, "status"))
+        self.status = status.RevisionStatus(os.path.join(self.base_dir,
+                                                         "status"))
 
     work_dir = _filenameproperty("work")
     binary_dir = _filenameproperty("binary")
     src_dir = _filenameproperty("src")
+    build_log = _filenameproperty("build.log")
 
     def find_dsc_file(self):
         for filename in os.listdir(self.src_dir):
@@ -214,6 +216,9 @@
                 return os.path.join(self.src_dir, filename)
         return None
 
+    def has_build_log(self):
+        return os.path.exists(self.build_log)
+
     def package(self):
         try:
             util.ensure_directory(self.work_dir)
@@ -229,12 +234,11 @@
 
             bin_packager = self.binary_packager_cls(self.pkg_line, self.status,
                                                     self.binary_dir, dsc_file,
-                                                    os.path.join(self.base_dir,
-                                                                 "build.log"))
+                                                    self.build_log)
             bin_packager.package()
             self.status.stop = datetime.datetime.utcnow()
         except:
-            self.status.status = "error"
+            self.status.error()
             self.status.stop = datetime.datetime.utcnow()
             raise
 
@@ -314,7 +318,7 @@
             subversion.update(localdir)
         else:
             logging.info("The working copy in %r doesn't exist yet."
-                         "  Checking out fromo %r", localdir,
+                         "  Checking out from %r", localdir,
                          self.svn_url)
             subversion.checkout(self.svn_url, localdir)
 
This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)