[Fedora-livecd-list] imgcreate/creator.py tools/image-creator tools/livecd-creator

[Jeremy Katz]

 imgcreate/creator.py |    3 ---
 tools/image-creator  |    5 -----
 tools/livecd-creator |    6 ------
 3 files changed, 14 deletions(-)

New commits:
commit 26b39090403d75ef11cb43b52d5a29202a6ad533
Author: Jeremy Katz <katzj at redhat.com>
Date:   Tue Apr 21 10:09:16 2009 -0400

    Revert "creator: "-d" opt and matching setdebug() method that gets rpm in debug mode"
    
    This reverts commit 456c1682e5352a1b2277195d5c261d530a014d30 as the option conflicts
    with other existing options

diff --git a/imgcreate/creator.py b/imgcreate/creator.py
index a7c79c7..823afc5 100644
--- a/imgcreate/creator.py
+++ b/imgcreate/creator.py
@@ -760,9 +760,6 @@ class ImageCreator(object):
             shutil.move(os.path.join(self._outdir, f),
                         os.path.join(destdir, f))
 
-    def setdebug(self):
-        rpm.setVerbosity(rpm.RPMLOG_DEBUG)
-
     def create(self):
         """Install, configure and package an image.
 
diff --git a/tools/image-creator b/tools/image-creator
index 51b2558..6f2604c 100755
--- a/tools/image-creator
+++ b/tools/image-creator
@@ -30,8 +30,6 @@ def parse_options(args):
 
     parser.add_option("-n", "--name", type="string", dest="name",
                       help="Image name and filesystem label")
-    parser.add_option("-d", "--debug", action="store_true", dest="debug",
-                      help="Enable debug mode")
 
     imgcreate.setup_logging(parser)
 
@@ -63,9 +61,6 @@ def main():
 
     creator = imgcreate.LoopImageCreator(ks, name)
 
-    if options.debug:
-        creator.setdebug()
-
     try:
         creator.create()
     except imgcreate.CreatorError, e:
diff --git a/tools/livecd-creator b/tools/livecd-creator
index c534900..39f7478 100755
--- a/tools/livecd-creator
+++ b/tools/livecd-creator
@@ -60,9 +60,6 @@ def parse_options(args):
     # Start a shell in the chroot for post-configuration.
     parser.add_option("-l", "--shell", action="store_true", dest="give_shell",
                       help=optparse.SUPPRESS_HELP)
-    parser.add_option("-d", "--debug", action="store_true", dest="debug",
-                      help="Enable debugging during the build")
-
     # Don't compress the image.
     parser.add_option("-s", "--skip-compression", action="store_true", dest="skip_compression",
                       help=optparse.SUPPRESS_HELP)
@@ -121,9 +118,6 @@ def main():
     if options.cachedir:
         options.cachedir = os.path.abspath(options.cachedir)
 
-    if options.debug:
-        creator.setdebug()
-
     try:
         creator.mount(options.base_on, options.cachedir)
         creator.install()