From 10000ddd8a989b0fbd1def413ba621ff7e09d8ff Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@cd1c1023-2f26-0410-ae45-c471fc1f0318> Date: Sat, 23 Feb 2008 15:51:50 +0000 Subject: [PATCH] make spritz using entropy version git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1284 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- spritz/src/misc.py | 48 ++-------------------------------------------- 1 file changed, 2 insertions(+), 46 deletions(-) diff --git a/spritz/src/misc.py b/spritz/src/misc.py index 0e4f2d2dc..ab21d533d 100644 --- a/spritz/src/misc.py +++ b/spritz/src/misc.py @@ -21,18 +21,14 @@ import logging import gtk import gobject import time -import sys,os -# Use Python ConfigParser -from ConfigParser import ConfigParser,SafeConfigParser - -from optparse import OptionParser from i18n import _ import packages +from entropyConstants import * class const: ''' This Class contains all the Constants in Yumex''' - __spritz_version__ = "0.3" + __spritz_version__ = etpConst['entropyversion'] # Paths MAIN_PATH = os.path.abspath( os.path.dirname( sys.argv[0] ) ); GLADE_FILE = MAIN_PATH+'/spritz.glade' @@ -461,46 +457,6 @@ class SpritzConf: disable_repo_page = False branding_title = 'Spritz Package Manager' - # - # This routines are taken from config.py yum > 3.2.2 - # They are because we want the config save to work - # better with older Yum version (EL5 & FC6) - # - - def write(self, fileobj, section=None, always=()): - '''Write out the configuration to a file-like object - - @param fileobj: File-like object to write to - @param section: Section name to use. If not-specified the section name - used during parsing will be used. - @param always: A sequence of option names to always write out. - Options not listed here will only be written out if they are at - non-default values. Set to None to dump out all options. - ''' - # Write section heading - if section is None: - if self._section is None: - raise ValueError("not populated, don't know section") - section = self._section - - # Updated the ConfigParser with the changed values - cfgOptions = self.cfg.options(section) - for name,value in self.iteritems(): - option = self.optionobj(name) - if always is None or name in always or option.default != value or name in cfgOptions : - self.cfg.set(section,name, option.tostring(value)) - # write the updated ConfigParser to the fileobj. - self.cfg.write(fileobj) - - def getConfigOption(self, option, default=None): - warnings.warn('getConfigOption() will go away in a future version of Yum.\n' - 'Please access option values as attributes or using getattr().', - DeprecationWarning) - if hasattr(self, option): - return getattr(self, option) - return default - - def cleanMarkupSting(msg): msg = str(msg) # make sure it is a string msg = gobject.markup_escape_text(msg)