changeset 277:c01afec25fb7

buildnumber fixes
author hanwen <hanwen@xs4all.nl>
date Sun, 18 Dec 2005 15:55:04 +0100
parents 7436df3744d5
children f568872e7cb7
files driver.py specs/gub.py
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/driver.py	Sun Dec 18 15:54:33 2005 +0100
+++ b/driver.py	Sun Dec 18 15:55:04 2005 +0100
@@ -108,7 +108,7 @@
 		manager.uninstall_package (package)
 		
 
-	gub.log_command (' ** Package: %s\n' % package.name ())
+	gub.log_command (package.expand_string (' ** Package: %(name)s (%(version)s, %(build)s)\n'))
 
 	stages = ['untar', 'patch', 'configure', 'compile', 'install',
 		  'package', 'sysinstall', 'clean']
--- a/specs/gub.py	Sun Dec 18 15:54:33 2005 +0100
+++ b/specs/gub.py	Sun Dec 18 15:55:04 2005 +0100
@@ -117,7 +117,7 @@
 		self.settings = settings
 		self.url = ''
 		self.download = self.wget
-		self._build = get_build_number (self)
+		self._build = buildnumber.get_build_number (self)
 		
 	def package_dict (self, env={}):
 		dict = self.settings.get_substitution_dict ()
@@ -177,7 +177,7 @@
 		system (cmd % dict, env=dict, ignore_error=ignore_error,
 			verbose=self.settings.verbose)
 
-	def build ():
+	def build (self):
 		return '%d' % self._build
 
 	def skip (self):
@@ -381,6 +381,8 @@
 		pickle.dump (builds, open (self.build_db, 'w'))
 
 	def clean (self):
+		buildnumber.write_build_number (self)
+		
 		stamp = self.stamp_file ()
 		self.system ('''echo rm -rf %(srcdir)s %(builddir)s %(install_root)s %(stamp)s
 ''', locals ())
@@ -396,6 +398,8 @@
 ''',
 			     locals ())
 
+						 
+
 	def set_download (self, mirror=download.gnu, format='gz', download=wget):
 		"""Setup URLs and functions for downloading.