diff options
author | Till Maas <opensource@till.name> | 2013-06-28 23:00:38 +0200 |
---|---|---|
committer | Till Maas <opensource@till.name> | 2013-06-28 23:05:13 +0200 |
commit | 1c6879c29048b2d23024704daa908283b779f8d1 (patch) | |
tree | 5284c5ff99dba099b2c5e73a2cf0ff66862c3c9b | |
parent | 72cf0610d11992b5def5274826cdad7e1c1432ed (diff) | |
download | cnucnu-1c6879c29048b2d23024704daa908283b779f8d1.tar.gz cnucnu-1c6879c29048b2d23024704daa908283b779f8d1.tar.xz cnucnu-1c6879c29048b2d23024704daa908283b779f8d1.zip |
various cleanup
-rwxr-xr-x | cnucnu.py | 10 | ||||
-rwxr-xr-x | cnucnu/package_list.py | 17 |
2 files changed, 13 insertions, 14 deletions
@@ -24,7 +24,7 @@ import os import cnucnu import cnucnu.errors as cc_errors from cnucnu.config import global_config -from cnucnu.package_list import Repository, PackageList, Package +from cnucnu.package_list import Repository, PackageList from cnucnu.checkshell import CheckShell from cnucnu.bugzilla_reporter import BugzillaReporter from cnucnu.scm import SCM @@ -35,6 +35,7 @@ pprint = pp.pprint log = logging.getLogger('cnucnu') + class Actions(object): def action_report_outdated(self, args): """ file bugs for outdated packages """ @@ -42,8 +43,6 @@ class Actions(object): repo = Repository(**global_config.config["repo"]) scm = SCM(**global_config.config["scm"]) - outdated = [] - pl = PackageList(repo=repo, scm=scm, br=br, **global_config.config["package list"]) for p in pl: if p.name >= args.start_with: @@ -74,7 +73,7 @@ class Actions(object): sys.exit(0) def action_shell(self, args): - """ run interavtive shell """ + """ run interactive shell """ shell = CheckShell(config=global_config) while True: if not shell.cmdloop(): @@ -91,7 +90,7 @@ class Actions(object): def action(self, action): action = action.replace("-", "_") - return getattr(self, "action_"+action) + return getattr(self, "action_" + action) def do(self, action, args): return self.action(action)(args) @@ -115,7 +114,6 @@ if __name__ == '__main__': args = parser.parse_args() - logging.basicConfig(level=getattr(logging, args.loglevel.upper())) # default to ./cnucnu.yaml if it exists and no config file is specified on diff --git a/cnucnu/package_list.py b/cnucnu/package_list.py index d3cd694..8146800 100755 --- a/cnucnu/package_list.py +++ b/cnucnu/package_list.py @@ -23,8 +23,9 @@ __docformat__ = "restructuredtext" # python default modules +import re # sre_constants contains re exceptions -import re, sre_constants +import sre_constants import urllib # cnucnu modules @@ -39,6 +40,7 @@ from helper import cmp_upstream_repo import pycurl from fedora.client.pkgdb import PackageDB + class Repository: def __init__(self, name="", path=""): if not (name and path): @@ -147,12 +149,12 @@ class Package(object): elif regex == "PEAR-DEFAULT": # strip "php-pear-" prefix only if name was not overridden if not name_override and name.startswith("php-pear-"): - name = name[len("php-pear-"):].replace("-","_") + name = name[len("php-pear-"):].replace("-", "_") regex = "DEFAULT" elif regex == "PECL-DEFAULT": # strip "php-pecl-" prefix only if name was not overridden if not name_override and name.startswith("php-pecl-"): - name = name[len("php-pecl-"):].replace("-","_") + name = name[len("php-pecl-"):].replace("-", "_") regex = "DEFAULT" elif regex == "RUBYGEMS-DEFAULT": # strip "rubygem-" prefix only if name was not overridden @@ -224,12 +226,12 @@ class Package(object): elif url == "PEAR-DEFAULT": # strip "php-pear-" prefix only if name was not overridden if not name_override and name.startswith("php-pear-"): - name = name[len("php-pear-"):].replace("-","_") + name = name[len("php-pear-"):].replace("-", "_") url = "http://pear.php.net/package/%s/download" % name elif url == "PECL-DEFAULT": # strip "php-pecl-" prefix only if name was not overridden if not name_override and name.startswith("php-pecl-"): - name = name[len("php-pecl-"):].replace("-","_") + name = name[len("php-pecl-"):].replace("-", "_") url = "http://pecl.php.net/package/%s/download" % name elif url == "LP-DEFAULT": url = "https://launchpad.net/%s/+download" % name @@ -246,7 +248,6 @@ class Package(object): name = name[len("nodejs-"):] url = "http://registry.npmjs.org/%s" % name - self.__url = url self.html = None @@ -312,13 +313,13 @@ class Package(object): @property def repo_version(self): if not self._repo_version: - self._repo_version = self.repo.package_version(self) + self._repo_version = self.repo.package_version(self) return self._repo_version @property def repo_release(self): if not self._repo_release: - self._repo_release = self.repo.package_release(self) + self._repo_release = self.repo.package_release(self) return self._repo_release @property |