changeset 299:2e3fe124ca1c

read darwin-sdk gubball directly.
author hanwen <hanwen@xs4all.nl>
date Sun, 18 Dec 2005 20:28:51 +0100
parents 5482ad0c7b33
children 9ed7caa96ac6
files specs/installer.py
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/specs/installer.py	Sun Dec 18 20:23:08 2005 +0100
+++ b/specs/installer.py	Sun Dec 18 20:28:51 2005 +0100
@@ -1,6 +1,5 @@
 import os
 import re
-
 import gub
 
 # FIXME: Want to share package_dict () and system () with gub.Package,
@@ -153,10 +152,12 @@
 		
 		
 	def get_ignore_libs (self):
-		list_file = self.settings.system_root + '/etc/setup/darwin-sdk.lst.gz'
-		for l in gzip.open(list_file).readlines ():
+		str = self.read_pipe ('tar tfz %(gub_uploads)s/darwin-sdk-0.0-1.darwin.gub')
+		d = {}
+		for l in str.split ('\n'):
+			l = l.strip ()
 			if re.match (r'^\./usr/lib/', l):
-				d[l[1:-1]] = True
+				d[l[1:]] = True
 		return d
 	
 	def create (self):
@@ -216,7 +217,6 @@
 		build = self.settings.build
 		self.system ('cd %(installer_uploads)s && fakeroot alien --keep-version --to-rpm %(installer_uploads)s/%(name)s-%(bundle_version)s-%(package_arch)s-%(build)s.tgz', locals ())
 
-
 class Autopackage (Linux_installer):
 	def create (self):
 		self.system ('rm -rf %(build_autopackage)s')