Hello community, here is the log from the commit of package smart checked in at Thu Apr 27 00:35:57 CEST 2006. -------- --- smart/smart.changes 2006-03-04 13:37:10.000000000 +0100 +++ STABLE/smart/smart.changes 2006-04-26 21:00:34.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 26 15:37:23 CEST 2006 - cthiel@suse.de + +- updated smart-YaST2.diff (r698) +- split of smart-trunk.diff from smart-YaST2.diff + +------------------------------------------------------------------- New: ---- smart-trunk.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smart.spec ++++++ --- /var/tmp/diff_new_pack.tBOaJy/_old 2006-04-27 00:35:47.000000000 +0200 +++ /var/tmp/diff_new_pack.tBOaJy/_new 2006-04-27 00:35:47.000000000 +0200 @@ -14,12 +14,13 @@ BuildRequires: python-devel python-elementtree python-gtk rpm-devel rpm-python update-desktop-files Summary: Smart Package Manager Version: 0.41 -Release: 12 +Release: 19 Source: %{name}-%{version}.tar.bz2 Source1: distro.py Source2: %{name}.desktop Patch: %{name}-%{version}.diff Patch1: %{name}-YaST2.diff +Patch3: smart-trunk.diff URL: http://smartpm.org Group: System/Packages License: GPL @@ -61,6 +62,7 @@ %setup -q %patch %patch1 +%patch3 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -114,6 +116,9 @@ %{_datadir}/pixmaps/smart.png %changelog -n smart +* Wed Apr 26 2006 - cthiel@suse.de +- updated smart-YaST2.diff (r698) +- split of smart-trunk.diff from smart-YaST2.diff * Sat Mar 04 2006 - cthiel@suse.de - updated to reflect python changes due to #149809 * Mon Feb 20 2006 - cthiel@suse.de ++++++ smart-YaST2.diff ++++++ --- /var/tmp/diff_new_pack.tBOaJy/_old 2006-04-27 00:35:47.000000000 +0200 +++ /var/tmp/diff_new_pack.tBOaJy/_new 2006-04-27 00:35:47.000000000 +0200 @@ -1,22 +1,5 @@ ---- smart/interfaces/text/interface.py (.../tags/0.41) (Revision 696) -+++ smart/interfaces/text/interface.py (.../branches/yast2-channel) (Revision 696) -@@ -210,12 +210,12 @@ - print - pkgs = report.installing.keys() - if pkgs: -- print _("Installed packages (%d):") % len(pkgs) -+ print _("Installing packages (%d):") % len(pkgs) - showPackages(pkgs) - print - pkgs = report.removed.keys() - if pkgs: -- print _("Removed packages (%d):") % len(pkgs) -+ print _("Removing packages (%d):") % len(pkgs) - showPackages(pkgs) - print - ---- smart/channels/yast2.py (.../tags/0.41) (Revision 0) -+++ smart/channels/yast2.py (.../branches/yast2-channel) (Revision 696) +--- smart/channels/yast2.py ++++ smart/channels/yast2.py @@ -0,0 +1,119 @@ +# +# Copyright (c) 2004 Conectiva, Inc. @@ -137,10 +120,9 @@ + data["priority"]) + +# vim:ts=4:sw=4:et - ---- smart/channels/yast2_info.py (.../tags/0.41) (Revision 0) -+++ smart/channels/yast2_info.py (.../branches/yast2-channel) (Revision 696) -@@ -0,0 +1,33 @@ +--- smart/channels/yast2_info.py ++++ smart/channels/yast2_info.py +@@ -0,0 +1,35 @@ +# +# Copyright (c) 2004 Conectiva, Inc. +# @@ -166,92 +148,18 @@ + +kind = "package" + -+name = _("YaST2 Repository (experimental!)") ++name = _("YaST2 Repository") + +description = _(""" +Repositories created for YaST2. +""") + +fields = [("baseurl", _("Base URL"), str, None, -+ _("Base URL of YaST2 repository, where directory.yast is located."))] - ---- smart/backends/rpm/base.py (.../tags/0.41) (Revision 696) -+++ smart/backends/rpm/base.py (.../branches/yast2-channel) (Revision 696) -@@ -50,9 +50,14 @@ - if not sysconf.get("rpm-check-signatures", False): - getTS.ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES) - dbdir = os.path.join(getTS.root, "var/lib/rpm") -+ if not os.path.isdir(dbdir): -+ try: -+ os.makedirs(dbdir) -+ except (OSError), e: -+ raise Error, _("Could not create rpm-root at %s: %s") \ -+ % (dbdir, unicode(e)) - if not os.path.isfile(os.path.join(dbdir, "Packages")): - try: -- os.makedirs(dbdir) - getTS.ts.initDB() - except (rpm.error, OSError): - raise Error, _("Couldn't initizalize rpm database at %s") \ - ---- smart/backends/rpm/pm.py (.../tags/0.41) (Revision 696) -+++ smart/backends/rpm/pm.py (.../branches/yast2-channel) (Revision 696) -@@ -112,6 +112,15 @@ - if level is not None: - rpm.setVerbosity(level) - -+ # Set rpm output log file -+ rpmlogfile = sysconf.get('rpm-log-file') -+ if rpmlogfile is not None: -+ try: -+ rpmlog = open(rpmlogfile, 'w') -+ rpm.setLogFile(rpmlog) -+ except (IOError, OSError), e: -+ raise Error, "%s: %s" % (rpmlogfile, unicode(e)) -+ - # Let's help RPM, since it doesn't do a good - # ordering job on erasures. - try: - ---- smart/backends/rpm/metadata.py (.../tags/0.41) (Revision 696) -+++ smart/backends/rpm/metadata.py (.../branches/yast2-channel) (Revision 696) -@@ -74,7 +74,7 @@ - - class RPMMetaDataLoader(Loader): - -- __stateversion__ = Loader.__stateversion__+2 -+ __stateversion__ = Loader.__stateversion__+3 - - def __init__(self, filename, filelistsname, baseurl): - Loader.__init__(self) -@@ -178,10 +178,12 @@ - (elem.get("ver"), elem.get("rel")) - - elif tag == SUMMARY: -- info["summary"] = elem.text -+ if elem.text: -+ info["summary"] = elem.text - - elif tag == DESCRIPTION: -- info["description"] = elem.text -+ if elem.text: -+ info["description"] = elem.text - - elif tag == SIZE: - info["size"] = int(elem.get("package")) -@@ -196,7 +198,8 @@ - info["location"] = elem.get("href") - - elif tag == GROUP: -- info["group"] = elem.text -+ if elem.text: -+ info["group"] = elem.text - - elif tag == FILE: - filedict[elem.text] = True - ---- smart/backends/rpm/yast2.py (.../tags/0.41) (Revision 0) -+++ smart/backends/rpm/yast2.py (.../branches/yast2-channel) (Revision 696) ++ _("Base URL of YaST2 repository, where directory.yast is located.")), ++ ("medias", _("Medias"), str, "", ++ _("Space separated list of medias. (NOT IN USE YET)"))] +--- smart/backends/rpm/yast2.py ++++ smart/backends/rpm/yast2.py @@ -0,0 +1,299 @@ +# +# Copyright (c) 2004 Conectiva, Inc. @@ -400,7 +308,7 @@ + + # avoid parsing errors on undefined fields + requires = prequire = conflicts = obsoletes = [] -+ group = summary = description = "" ++ group = summary = description = size = "" + + for line in self._pkgentry: + kw = line[:4] ++++++ smart-trunk.diff ++++++ --- README +++ README @@ -397,7 +397,7 @@ Downgrading packages (1): glibc-gconvdata-0:2.3.3-69473cl.i386 - Installed packages (4): + Installing packages (4): glibc-iconv-0:2.3.3-69473cl.i386 libglade2-2.4.0-68154cl.i386 libxml2-2:2.6.13-67598cl.i386 @@ -504,7 +504,7 @@ Computing transaction... - Installed packages (2): + Installing packages (2): A-1.0-1cl@i386 BCD-1.0-1cl@i386 2.7kb of package files are needed. @@ -648,7 +648,7 @@ Upgrading packages (1): B-2.0-1cl@i386 - Installed packages (1): + Installing packages (1): C-2.0-1cl@i386 2.6kB of package files are needed. --- smart/backends/rpm/base.py +++ smart/backends/rpm/base.py @@ -50,9 +50,14 @@ if not sysconf.get("rpm-check-signatures", False): getTS.ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES) dbdir = os.path.join(getTS.root, "var/lib/rpm") - if not os.path.isfile(os.path.join(dbdir, "Packages")): + if not os.path.isdir(dbdir): try: os.makedirs(dbdir) + except (OSError), e: + raise Error, _("Could not create rpm-root at %s: %s") \ + % (dbdir, unicode(e)) + if not os.path.isfile(os.path.join(dbdir, "Packages")): + try: getTS.ts.initDB() except (rpm.error, OSError): raise Error, _("Couldn't initizalize rpm database at %s") \ --- smart/backends/rpm/header.py +++ smart/backends/rpm/header.py @@ -100,6 +100,15 @@ def getSummary(self): s = self._h[rpm.RPMTAG_SUMMARY] + if type(s) == list: + if len(s) > 0: + s = s[0] + else: + return "" + pass + if len(s) == 0: + return "" + for encoding in ENCODINGS: try: s = s.decode(encoding) --- smart/backends/rpm/metadata.py +++ smart/backends/rpm/metadata.py @@ -74,7 +74,7 @@ class RPMMetaDataLoader(Loader): - __stateversion__ = Loader.__stateversion__+2 + __stateversion__ = Loader.__stateversion__+3 def __init__(self, filename, filelistsname, baseurl): Loader.__init__(self) @@ -178,10 +178,12 @@ (elem.get("ver"), elem.get("rel")) elif tag == SUMMARY: - info["summary"] = elem.text + if elem.text: + info["summary"] = elem.text elif tag == DESCRIPTION: - info["description"] = elem.text + if elem.text: + info["description"] = elem.text elif tag == SIZE: info["size"] = int(elem.get("package")) @@ -196,7 +198,8 @@ info["location"] = elem.get("href") elif tag == GROUP: - info["group"] = elem.text + if elem.text: + info["group"] = elem.text elif tag == FILE: filedict[elem.text] = True --- smart/backends/rpm/pm.py +++ smart/backends/rpm/pm.py @@ -115,6 +115,15 @@ if level is not None: rpm.setVerbosity(level) + # Set rpm output log file + rpmlogfile = sysconf.get('rpm-log-file') + if rpmlogfile is not None: + try: + rpmlog = open(rpmlogfile, 'w') + rpm.setLogFile(rpmlog) + except (IOError, OSError), e: + raise Error, "%s: %s" % (rpmlogfile, unicode(e)) + # Let's help RPM, since it doesn't do a good # ordering job on erasures. try: --- smart/interfaces/text/interface.py +++ smart/interfaces/text/interface.py @@ -210,12 +210,12 @@ print pkgs = report.installing.keys() if pkgs: - print _("Installed packages (%d):") % len(pkgs) + print _("Installing packages (%d):") % len(pkgs) showPackages(pkgs) print pkgs = report.removed.keys() if pkgs: - print _("Removed packages (%d):") % len(pkgs) + print _("Removing packages (%d):") % len(pkgs) showPackages(pkgs) print ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...