From 6b01b2c8287cf080d988b16a3720b967063837d6 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Aug 01 2011 20:31:28 +0000 Subject: Make sure build system patch actually applies :/ --- diff --git a/virtinst-fix-po-install.patch b/virtinst-fix-po-install.patch index 420d335..d41e42a 100644 --- a/virtinst-fix-po-install.patch +++ b/virtinst-fix-po-install.patch @@ -1,5 +1,5 @@ diff --git a/setup.py b/setup.py -index ba4e2d2..27a1c5a 100755 +index 52f1ea8..27a1c5a 100755 --- a/setup.py +++ b/setup.py @@ -23,17 +23,29 @@ from distutils.command.sdist import sdist @@ -41,18 +41,21 @@ index ba4e2d2..27a1c5a 100755 config_template = """ __version__ = "%(VERSION)s" __version_info__ = tuple([ int(num) for num in __version__.split('.')]) -@@ -318,29 +330,24 @@ class mybuild(build): +@@ -312,30 +324,30 @@ class mybuild(build): + "VERSION" : VERSION, + "RHEL6DEFAULTS" : self.rhel6defaults, + } ++ + config_data = config_template % config_opts + print "Version : %s" % VERSION print "RHEL6 defaults : %s" % bool(self.rhel6defaults) for f in config_files: -- origconfig = file(f).read() -- if origconfig == config_data: -- continue + if os.path.exists(f): + origconfig = file(f).read() + if origconfig == config_data: + continue - ++ print "Generating %s" % f fd = open(f, "w") fd.write(config_data) @@ -77,7 +80,7 @@ index ba4e2d2..27a1c5a 100755 build.run(self) setup( -@@ -353,8 +360,18 @@ setup( +@@ -348,8 +360,18 @@ setup( url='http://virt-manager.org', package_dir={'virtinst': 'virtinst'}, scripts=["virt-install", "virt-clone", "virt-image", "virt-convert"], @@ -98,7 +101,7 @@ index ba4e2d2..27a1c5a 100755 cmdclass={ 'test': TestCommand, 'test_urls' : TestURLFetch, -@@ -366,5 +383,5 @@ setup( +@@ -361,5 +383,5 @@ setup( 'refresh_translations': refresh_translations, 'build': mybuild,