Merged revisions 69724 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69724 | tarek.ziade | 2009-02-18 00:06:51 +0100 (Wed, 18 Feb 2009) | 1 line

  fixed the data_files inclusion behavior
........

diff --git a/Lib/distutils/command/sdist.py b/Lib/distutils/command/sdist.py
index 9bb2ae04e0fd633d07c56c50218bcb65ff79b302..1a64d0e3c13fa33b696658a1cfabfbf3660b5210 100644 (file)
--- a/Lib/distutils/command/sdist.py
+++ b/Lib/distutils/command/sdist.py
@@ -311,7 +311,7 @@ class sdist (Command):
                 else:    # a (dirname, filenames) tuple
                     dirname, filenames = item
                     for f in filenames:
-                        f = convert_path(os.path.join(dirname, f))
+                        f = convert_path(f)
                         if os.path.isfile(f):
                             self.filelist.append(f)
 

diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py
index 82e5dc6db6a822d2a03938e31a18ab0b54cdf5df..9c579b40cbff120c14758e825ad611b91aa27e81 100644 (file)
--- a/Lib/distutils/tests/test_sdist.py
+++ b/Lib/distutils/tests/test_sdist.py
@@ -23,6 +23,7 @@ setup(name='fake')
 
 MANIFEST = """\
 README
+inroot.txt
 setup.py
 data%(sep)sdata.dt
 scripts%(sep)sscript.py
@@ -171,10 +172,13 @@ class sdistTestCase(support.LoggingSilencer, PyPIRCCommandTestCase):
         self.write_file((data_dir, 'data.dt'), '#')
         some_dir = join(self.tmp_dir, 'some')
         os.mkdir(some_dir)
+        self.write_file((self.tmp_dir, 'inroot.txt'), '#')
         self.write_file((some_dir, 'file.txt'), '#')
         self.write_file((some_dir, 'other_file.txt'), '#')
 
-        dist.data_files = [('data', ['data.dt', 'notexisting']),
+        dist.data_files = [('data', ['data/data.dt',
+                                     'inroot.txt',
+                                     'notexisting']),
                            'some/file.txt',
                            'some/other_file.txt']
 
@@ -202,7 +206,7 @@ class sdistTestCase(support.LoggingSilencer, PyPIRCCommandTestCase):
             zip_file.close()
 
         # making sure everything was added
-        self.assertEquals(len(content), 10)
+        self.assertEquals(len(content), 11)
 
         # checking the MANIFEST
         manifest = open(join(self.tmp_dir, 'MANIFEST')).read()

diff --git a/Misc/ACKS b/Misc/ACKS
index 80252bac5dfbae31c26496978213c1e7ce16c8ae..ca6500e1c2254b2b8e13a93abe37f6ac2eff8450 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -613,6 +613,7 @@ Sam Rushing
 Mark Russell
 Nick Russo
 Hajime Saitou
+George Sakkis
 Rich Salz
 Kevin Samborn
 Ilya Sandler