File pybugz-0.7.3-novellbugzilla.patch of Package pybugz

File pybugz-0.7.3-novellbugzilla.patch of Package pybugz (Revision 9f36172005110cb6f1a19a87e33f2109)

Currently displaying revision 9f36172005110cb6f1a19a87e33f2109, show latest

Index: pybugz-0.7.3/bugz.py
===================================================================
--- pybugz-0.7.3.orig/bugz.py	2007-12-30 20:21:55.000000000 +0100
+++ pybugz-0.7.3/bugz.py	2008-05-21 15:24:35.958431000 +0200
@@ -248,6 +248,8 @@ class BugzConfig:
 
     }
 
+    use_emerge = False
+
 import csv
 import os
 import re
@@ -274,7 +276,7 @@ except ImportError:
 #
 # Global configuration
 #
-
+#exec(open('NovellBugzConfig.py').read())
 try:
     config
 except NameError:
@@ -608,12 +610,13 @@ class Bugz:
                     self.cookiejar.load()
                     self.cookiejar.clear()
                     self.cookiejar.save()
-                    os.chmod(self.cookiejar.filename, 0700)
+                    os.chmod(self.cookiejar.filename, 0600)
                 except IOError:
                     pass
         except KeyError:
             self.warn('Unable to save session cookies in %s' % cookie_file)
             self.cookiejar = CookieJar(cookie_file)
+        self.cookiejar.load()
 
         self.opener = build_opener(HTTPCookieProcessor(self.cookiejar))
         self.user = user
@@ -842,6 +845,7 @@ class Bugz:
         etree = ElementTree.parse(fd, parser)
         bug = etree.find('.//bug')
         if bug and bug.attrib.has_key('error'):
+            print bug.attrib['error']
             return None
         else:
             return etree
@@ -1168,7 +1172,7 @@ class Bugz:
 class PrettyBugz(Bugz):
     options = {
         'base': make_option('-b', '--base', type='string',
-                            default = 'http://bugs.gentoo.org/',
+                            default = 'https://bugzilla.novell.com/',
                             help = 'Base URL of Bugzilla'),
         'user': make_option('-u', '--user', type='string',
                             help = 'Username for commands requiring authentication'),
@@ -1482,12 +1486,12 @@ class PrettyBugz(Bugz):
         print description
         print '-' * (self.columns - 1)
 
-        if emerge_info == None:
+        if config.use_emerge and emerge_info == None:
             ask_emerge = raw_input('Include output of emerge --info (Y/n)?')
             if ask_emerge[0] in ('y', 'Y'):
                 emerge_info = True
 
-        if emerge_info:
+        if config.use_emerge and emerge_info:
             import commands
             emerge_info_output = commands.getoutput('%s --info' % EMERGE)
             description = description + '\n' + emerge_info_output