r2619 - /1.2/sconstruct -- October 12, 2006 - 06:32

Author: bugman
Date: Thu Oct 12 06:32:18 2006
New Revision: 2619

URL: http://svn.gna.org/viewcvs/relax?rev=2619&view=rev
Log:
Fixed a bug in the 'self.package()' target function.

The variable 'file_name' was being accessed when the variable should have 
been called
env['DIST_FILE'].


Modified:
    1.2/sconstruct

Modified: 1.2/sconstruct
URL: 
http://svn.gna.org/viewcvs/relax/1.2/sconstruct?rev=2619&r1=2618&r2=2619&view=diff
==============================================================================
--- 1.2/sconstruct (original)
+++ 1.2/sconstruct Thu Oct 12 06:32:18 2006
@@ -533,7 +533,7 @@
         print "#######################"
         print "# Packaging the files #"
         print "#######################\n\n"
-        print "Creating the package distribution " + `file_name` + ".\n"
+        print "Creating the package distribution " + `env['DIST_FILE']` + 
".\n"
 
         # Open the Zip distribution file.
         if self.DIST_TYPE == 'zip':
@@ -541,9 +541,9 @@
 
         # Open the Tar distribution file.
         elif self.DIST_TYPE == 'tar':
-            if search('.bz2$', file_name):
+            if search('.bz2$', env['DIST_FILE']):
                 archive = TarFile.bz2open(path.pardir + path.sep + 
env['DIST_FILE'], 'w')
-            elif search('.gz$', file_name):
+            elif search('.gz$', env['DIST_FILE']):
                 archive = TarFile.gzopen(path.pardir + path.sep + 
env['DIST_FILE'], 'w')
             else:
                 archive = TarFile.open(path.pardir + path.sep + 
env['DIST_FILE'], 'w')