[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.51

David Steele dsteele at gmail.com
Wed May 15 10:09:48 UTC 2013


The following commit has been merged in the master branch:
commit c148081f78b8e12f258a77fe68b1125cd51fd3b6
Author: David Steele <dsteele at gmail.com>
Date:   Sun Apr 7 16:27:07 2013 -0400

    Revert Python 2.7 requirement upgrade, and remove dwke options.
    
    Remove argparse from detect_well_known_errors, disabling command
    line argument support, and revert the required Python runtime to 2.6.

diff --git a/debian/changelog b/debian/changelog
index 69ba842..5478121 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,7 +34,6 @@ piuparts (0.51) UNRELEASED; urgency=low
   * New known problem: Database setup failure (issue).
 
   [ David Steele ]
-  * Update python Requires to 2.7 (for argparse)
   * detect_well_known_errors:
     - Replace the bash script with an equivalent Python script.
     - Sort known error and issue packages by reverse dependency count.
diff --git a/debian/control b/debian/control
index dd6c25e..8f895c2 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends-Indep:
 Homepage: http://piuparts.debian.org
 Vcs-Git: git://anonscm.debian.org/piuparts/piuparts.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git
-X-Python-Version: >= 2.7
+X-Python-Version: >= 2.6
 
 Package: piuparts
 Architecture: all
diff --git a/master-bin/detect_well_known_errors b/master-bin/detect_well_known_errors
index ab07816..5cf0577 100755
--- a/master-bin/detect_well_known_errors
+++ b/master-bin/detect_well_known_errors
@@ -23,7 +23,6 @@ import os
 import time
 import re
 from collections import namedtuple
-import argparse
 
 import piupartslib
 from piupartslib.conf import MissingSection
@@ -500,24 +499,6 @@ def create_problem_list( pdir ):
 
 if __name__ == '__main__':
 
-    parser = argparse.ArgumentParser(
-                 description="Detect/process well known errors to html",
-                 epilog="""
-This script processes all log files against defined "known_problem" files,
-caching the problems found, by package, into ".kpr" files. The cached data
-is summarized into html ".tpl" files in <html_dir>/<section>, which are then
-incorporated by piuparts-report into the final web reports.
-""" )
-
-    parser.add_argument( '--recheck', dest='recheck', action='store_true',
-               help="recheck all log files (delete cache)" )
-
-    parser.add_argument( '--recheck-failed', dest='recheck_failed',
-               action='store_true',
-               help="recheck failed log files (delete cache)" )
-
-    args = parser.parse_args()
-
     conf = WKE_Config()
     conf.read( CONFIG_FILE )
     if conf["proxy"]:
@@ -525,7 +506,6 @@ incorporated by piuparts-report into the final web reports.
 
     problem_list = create_problem_list( conf['known-problem-directory'] )
 
-    detect_well_known_errors( conf, problem_list, args.recheck,
-                              args.recheck_failed )
+    detect_well_known_errors( conf, problem_list, False, False )
 
 # vi:set et ts=4 sw=4 :

-- 
piuparts git repository



More information about the Piuparts-commits mailing list