diff options
| author | Pavel Raiskup <pavel@raiskup.cz> | 2013-01-20 14:18:33 +0100 |
|---|---|---|
| committer | Pavel Raiskup <pavel@raiskup.cz> | 2013-01-20 14:18:33 +0100 |
| commit | b7c25d2a1bc8a87af1f98721b768eda9ffc819f3 (patch) | |
| tree | c43e8b8412aea8bf5ef70bea256b582b416eb3f3 | |
| parent | 152986baa9ea2103b416a884cfcb6a04f82102bb (diff) | |
| download | pybugz-b7c25d2a1bc8a87af1f98721b768eda9ffc819f3.tar.gz pybugz-b7c25d2a1bc8a87af1f98721b768eda9ffc819f3.tar.xz pybugz-b7c25d2a1bc8a87af1f98721b768eda9ffc819f3.zip | |
Allow to exist without ~/.bugzrc file
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | pybugz-0.10git69cd7-downstream.patch | 23 |
2 files changed, 15 insertions, 10 deletions
@@ -1,2 +1,4 @@ pybugz-0.10git69cd7/ noarch +*.src.rpm +review-pybugz diff --git a/pybugz-0.10git69cd7-downstream.patch b/pybugz-0.10git69cd7-downstream.patch index cba1e83..71423b7 100644 --- a/pybugz-0.10git69cd7-downstream.patch +++ b/pybugz-0.10git69cd7-downstream.patch @@ -1,4 +1,4 @@ -From f460154895387f5f26bdd0fb5cebd7ed24175dba Mon Sep 17 00:00:00 2001 +From def461619e48e5675930dee00a515cae413bbb90 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup <pavel@raiskup.cz> Date: Sun, 20 Jan 2013 10:33:59 +0100 Subject: [PATCH] Downstream patch to follow @@ -7,18 +7,18 @@ Subject: [PATCH] Downstream patch to follow --- bin/bugz | 30 +++---- bugz/argparsers.py | 12 ++- - bugz/cli.py | 212 ++++++++++++++++++++++++++++------------------- - bugz/configfile.py | 214 +++++++++++++++++++++++++++++++++--------------- + bugz/cli.py | 212 ++++++++++++++++++++++++++++------------------ + bugz/configfile.py | 217 +++++++++++++++++++++++++++++++++--------------- bugz/errhandling.py | 6 ++ bugz/log.py | 72 ++++++++++++++++ bugzrc.example | 61 -------------- conf/conf.d/gentoo.conf | 3 + conf/conf.d/redhat.conf | 3 + - conf/pybugz.conf | 123 ++++++++++++++++++++++++++++ + conf/pybugz.conf | 123 +++++++++++++++++++++++++++ lbugz | 2 +- man/bugz.1 | 12 ++- setup.py | 4 + - 13 files changed, 522 insertions(+), 232 deletions(-) + 13 files changed, 525 insertions(+), 232 deletions(-) create mode 100644 bugz/errhandling.py create mode 100644 bugz/log.py delete mode 100644 bugzrc.example @@ -570,10 +570,10 @@ index a533da9..5075c87 100644 def showbuginfo(self, bug, show_attachments, show_comments): FIELDS = ( diff --git a/bugz/configfile.py b/bugz/configfile.py -index a900245..9440217 100644 +index a900245..43a502c 100644 --- a/bugz/configfile.py +++ b/bugz/configfile.py -@@ -1,70 +1,152 @@ +@@ -1,70 +1,155 @@ import ConfigParser -import os +import os, glob @@ -782,12 +782,15 @@ index a900245..9440217 100644 + while len(stack) > 0: + parse_file(settings, context, stack) + -+ if homeConf: ++ if not homeConf: + # the command-line option must win -+ settings['homeconf'] = homeConf ++ homeConf = settings['homeconf'] ++ ++ if not os.path.isfile(os.path.expanduser(homeConf)): ++ return settings + + # parse home configs -+ stack = [ settings['homeconf'] ] ++ stack = [ homeConf ] + while len(stack) > 0: + parse_file(settings, context, stack) + |