Index: Lib/distutils/tests/package/MANIFEST
===================================================================
--- Lib/distutils/tests/package/MANIFEST	(révision 0)
+++ Lib/distutils/tests/package/MANIFEST	(révision 0)
@@ -0,0 +1 @@
+setup.py

Modification de propriétés sur Lib/distutils/tests/package/MANIFEST
___________________________________________________________________
Nom : svn:eol-style
   + native

Index: Lib/distutils/tests/package/setup.py
===================================================================
--- Lib/distutils/tests/package/setup.py	(révision 0)
+++ Lib/distutils/tests/package/setup.py	(révision 0)
@@ -0,0 +1,4 @@
+from distutils.core import setup
+
+setup('fakepackage')
+

Modification de propriétés sur Lib/distutils/tests/package/setup.py
___________________________________________________________________
Nom : svn:keywords
   + Id
Nom : svn:eol-style
   + native

Index: Lib/distutils/tests/package/MANIFEST.in
===================================================================
--- Lib/distutils/tests/package/MANIFEST.in	(révision 0)
+++ Lib/distutils/tests/package/MANIFEST.in	(révision 0)
@@ -0,0 +1 @@
+include somecode.py

Modification de propriétés sur Lib/distutils/tests/package/MANIFEST.in
___________________________________________________________________
Nom : svn:eol-style
   + native

Index: Lib/distutils/tests/test_sdist.py
===================================================================
--- Lib/distutils/tests/test_sdist.py	(révision 0)
+++ Lib/distutils/tests/test_sdist.py	(révision 0)
@@ -0,0 +1,71 @@
+"""Tests for distutils.command.register."""
+import sys
+import os
+import unittest
+import shutil
+
+from distutils.command.sdist import sdist
+from distutils.core import Distribution
+
+from distutils.tests import support
+from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
+
+curdir = os.path.dirname(__file__)
+package_dir = os.path.join(curdir, 'package')
+dist_folder = os.path.join(package_dir, 'dist') 
+egg_info_folder = os.path.join(package_dir, 'UNKNOWN-0.0.0')
+
+class sdistTestCase(PyPIRCCommandTestCase):
+
+    def setUp(self):
+        self.old_path = os.getcwd()
+        os.chdir(package_dir)
+
+    def tearDown(self):
+        os.chdir(self.old_path)
+        if os.path.exists(dist_folder):
+            shutil.rmtree(dist_folder)
+        if os.path.exists(egg_info_folder):
+            shutil.rmtree(egg_info_folder)
+
+    def test_make_distribution(self):
+       
+        # creating a gztar and a tar
+        dist = Distribution()
+        dist.script_name = 'setup.py'
+        cmd = sdist(dist)
+        cmd.manifest = 'MANIFEST'
+        cmd.template = 'MANIFEST.in'
+        cmd.dist_dir = 'dist'
+        cmd.formats = ['gztar', 'tar'] 
+        cmd.run()
+
+        # making sure we have two files
+        result = os.listdir(dist_folder)
+        result.sort()
+        self.assertEquals(result, 
+                          ['UNKNOWN-0.0.0.tar', 'UNKNOWN-0.0.0.tar.gz'] )
+
+        os.remove(os.path.join(dist_folder, 'UNKNOWN-0.0.0.tar'))
+        os.remove(os.path.join(dist_folder, 'UNKNOWN-0.0.0.tar.gz'))
+
+
+        # now trying a tar then a gztar
+        cmd.formats = ['tar', 'gztar'] 
+        cmd.run()
+        
+        result = os.listdir(dist_folder)
+        result.sort()
+        self.assertEquals(result, 
+                          ['UNKNOWN-0.0.0.tar', 'UNKNOWN-0.0.0.tar.gz'] )
+
+
+
+
+
+
+def test_suite():
+    return unittest.makeSuite(sdistTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")

Modification de propriétés sur Lib/distutils/tests/test_sdist.py
___________________________________________________________________
Nom : svn:keywords
   + Id
Nom : svn:eol-style
   + native

Index: Lib/distutils/command/sdist.py
===================================================================
--- Lib/distutils/command/sdist.py	(révision 67943)
+++ Lib/distutils/command/sdist.py	(copie de travail)
@@ -447,6 +447,9 @@
 
         self.make_release_tree(base_dir, self.filelist.files)
         archive_files = []              # remember names of files we create
+        # tar archive must be created last to avoid overwrite and remove
+        if 'tar' in self.formats:
+            self.formats.append(self.formats.pop(self.formats.index('tar')))
         for fmt in self.formats:
             file = self.make_archive(base_name, fmt, base_dir=base_dir)
             archive_files.append(file)