Don't allow specifying sdist_dsc options to bdist_deb

CHANGELOG.txt

@@ -1,3 +1,5 @@
+2009-12-30 Don't allow specifying sdist_dsc options to bdist_deb
+
 2009-12-29 The --process-dependencies option to py2dsc was dropped,
            because this functionality went beyond the scope of the
            py2dsc script. The functionality could be added to a new

README.rst

@@ -346,24 +346,27 @@ commands. Second, you may provide an ``stdeb.cfg`` file.
 stdeb distutils command options
 ```````````````````````````````
 
-Both the sdist_dsc and bdist_deb commands take the same set of
-options. These may be given as command-line options to the distutils
+The sdist_dsc command takes command-line options to the distutils
 command. For example::
 
   python setup.py --command-packages=stdeb.command sdist_dsc --debian-version 0MyName1
 
-Would create a Debian package with the Debian version set to
+This creates a Debian package with the Debian version set to
 "0MyName1".
 
 These options can also be set via distutils configuration
 files. (These are the ``setup.cfg`` file alongside ``setup.py`` and
 the ~/.pydistutils.cfg file.) In that case, put the arguments in the
-``[sdist_dsc]`` or ``[bdist_deb]`` section. For example, a project's
-``~/.setup.cfg`` file might have this::
+``[sdist_dsc]`` section. For example, a project's ``~/.setup.cfg``
+file might have this::
 
   [sdist_dsc]
   force-buildsystem: False
 
+To pass these commands to sdist_dsc when calling bdist_deb, do this::
+
+  python setup.py sdist_dsc --debian-version 0MyName1 bdist_deb
+
 ====================================== =========================================
         Command line option                      Effect
 ====================================== =========================================

RELEASE_NOTES.txt

@@ -14,6 +14,15 @@ The --process-dependencies option to py2dsc was dropped, because this
 functionality went beyond the scope of the py2dsc script. The
 functionality could be added to a new script if desired.
 
+The ability to pass command options to sdist_dsc by specifying them to
+bdist_deb was removed. In other words, if you did this in the past::
+
+  python setup.py bdist_deb --no-backwards-compatibility
+
+You must now do this::
+
+  python setup.py sdist_dsc --no-backwards-compatibility bdist_deb
+
 Release 0.4.3
 =============
 

scripts/pypi-install

@@ -111,8 +111,9 @@ def main():
                 expanded_dir = entry
 
         os.chdir( expanded_dir )
-        cmd = ('%s setup.py --command-packages=stdeb.command bdist_deb '
-               '--guess-conflicts-provides-replaces=True' % (sys.executable, ) )
+        cmd = ('%s setup.py --command-packages=stdeb.command sdist_dsc '
+               '--guess-conflicts-provides-replaces=True bdist_deb' %
+               (sys.executable, ) )
         if options.verbose >= 2:
             myprint('executing: %s'%cmd)
         subprocess.check_call(cmd, shell=True)

stdeb/command/bdist_deb.py

@@ -2,15 +2,25 @@
 import stdeb.util as util
 from stdeb.command.sdist_dsc import sdist_dsc
 
+from distutils.core import Command
+
 __all__ = ['bdist_deb']
 
-class bdist_deb(sdist_dsc):
+class bdist_deb(Command):
     description = 'distutils command to create debian binary package'
 
-    # extend the run method
+    user_options = []
+    boolean_options = []
+
+    def initialize_options (self):
+        pass
+
+    def finalize_options (self):
+        pass
+
     def run(self):
-        # call parent run() method to generate .dsc source pkg
-	sdist_dsc.run(self)
+        # generate .dsc source pkg
+        self.run_command('sdist_dsc')
 
         # execute system command and read output (execute and read output of find cmd)
         dsc_tree = 'deb_dist'