Hello community, here is the log from the commit of package smart checked in at Fri Jun 23 01:16:10 CEST 2006. -------- --- smart/smart.changes 2006-06-16 15:10:18.000000000 +0200 +++ smart/smart.changes 2006-06-22 19:16:56.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Jun 22 19:16:25 CEST 2006 - cthiel@suse.de + +- turn rpm-check-signatures=true into a weak default option + +------------------------------------------------------------------- +Fri Jun 16 18:50:59 CEST 2006 - cthiel@suse.de + +- updated to svn trunk (r730) + +------------------------------------------------------------------- Old: ---- smart-yast2.patch smart.8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smart.spec ++++++ --- /var/tmp/diff_new_pack.tD6sii/_old 2006-06-23 01:15:58.000000000 +0200 +++ /var/tmp/diff_new_pack.tD6sii/_new 2006-06-23 01:15:58.000000000 +0200 @@ -14,15 +14,13 @@ BuildRequires: kdelibs3-devel python-devel python-elementtree python-gtk rpm-devel rpm-python update-desktop-files Summary: Smart Package Manager Version: 0.41.99 -Release: 1 +Release: 2 Source: %{name}-%{version}.tar.bz2 Source1: distro.py Source2: %{name}.desktop Source3: %{name}-ksmarttray.desktop -Source4: %{name}.8 Patch: %{name}-cElementTree.patch Patch1: %{name}-channel-mirrors.patch -Patch2: %{name}-yast2.patch URL: http://smartpm.org Group: System/Packages License: GPL @@ -79,7 +77,6 @@ %setup -q %patch %patch1 -%patch2 %if %{suse_version} < 1010 echo ' sysconf.set("no-rpm-readHeaderFromFD", 3)' >> %{SOURCE1} %endif @@ -107,7 +104,6 @@ $RPM_BUILD_ROOT%{_sbindir}/smart-update %{__install} -m 0644 -D %{SOURCE2} $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop %{__install} -m 0644 -D %{SOURCE3} $RPM_BUILD_ROOT/usr/share/applications/%{name}-ksmarttray.desktop -%{__install} -m 0644 -D %{SOURCE4} $RPM_BUILD_ROOT/%{_mandir}/man8/%{name}.8 %{__install} -m 0644 -D smart/interfaces/images/smart.png $RPM_BUILD_ROOT/usr/share/pixmaps/smart.png pushd contrib/rpmhelper python ./setup.py install --prefix=%{_prefix} --root="$RPM_BUILD_ROOT" @@ -165,6 +161,10 @@ /opt/kde3/share/apps/konqueror %changelog -n smart +* Thu Jun 22 2006 - cthiel@suse.de +- turn rpm-check-signatures=true into a weak default option +* Fri Jun 16 2006 - cthiel@suse.de +- updated to svn trunk (r730) * Fri Jun 16 2006 - cthiel@suse.de - added rudimental manpage (#184409) * Fri Jun 16 2006 - cthiel@suse.de ++++++ distro.py ++++++ --- smart/distro.py 2006-06-15 12:15:55.000000000 +0200 +++ smart/distro.py 2006-06-21 16:33:04.000000000 +0200 @@ -4,7 +4,7 @@ if not sysconf.getReadOnly(): - sysconf.set("rpm-check-signatures", True) + sysconf.set("rpm-check-signatures", True, weak=True) for type in ["kernel-bigsmp", "kernel-debug", "kernel-default", "kernel-dummy", "kernel-iseries64","kernel-ppc64", ++++++ smart-0.41.99.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/smart-0.41.99/MANIFEST.in new/smart-0.41.99/MANIFEST.in --- old/smart-0.41.99/MANIFEST.in 2006-06-15 21:17:08.000000000 +0200 +++ new/smart-0.41.99/MANIFEST.in 2006-06-16 17:50:02.000000000 +0200 @@ -1,6 +1,6 @@ recursive-include smart *.py *.c *.h *.png include smart setup.cfg MANIFEST.in HACKING IDEAS TODO LICENSE README Makefile -include doc/README.html doc/default.css +include doc/README.html doc/default.css doc/smart.8 recursive-include tests *.py *.txt recursive-include tests/data * diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/smart-0.41.99/doc/smart.8 new/smart-0.41.99/doc/smart.8 --- old/smart-0.41.99/doc/smart.8 1970-01-01 01:00:00.000000000 +0100 +++ new/smart-0.41.99/doc/smart.8 2006-06-16 17:50:02.000000000 +0200 @@ -0,0 +1,80 @@ +.\" smart - The Smart Package Manager +.TH "smart" "8" "2006 Jun 16" "Christoph Thiel" "" +.SH "NAME" +smart \- The Smart Package Manager +.SH "SYNOPSIS" +\fBsmart\fP command [options] [arguments] +.SH "DESCRIPTION" +The \fBSmart\fP Package Manager project has the ambitious objective of creating smart and portable algorithms for solving adequately the problem of managing software upgrading and installation. This tool works in all major distributions, and will bring notable advantages over native tools currently in use (APT, APT\-RPM, YUM, URPMI, etc). +.SH "Action commands" +.nf +update +install +reinstall +upgrade +remove +check +fix +download +clean +.fi +.SH "Setup commands" +.nf +channel +priority +mirror +flag +.fi +.SH "Query commands" +.nf +search +query +info +stats +.fi + +Run "smart command \-\-help" for more information. +.SH "Options" +.PP +.IP "\fB\-\-version\fP" +Show program's version number and exit +.IP "\fB\-\-config\-file=FILE\fP" +Configuration file (default is <data\-dir>/config) +.IP "\fB\-\-data\-dir=DIR\fP" +Specifies the config file location \- can take http, ftp urls and local file +Data directory (default is /var/lib/smart/) +.IP "\fB\-\-log\-level=LEVEL\fP" +Set the log level to level (debug, info, warning, error) +.IP "\fB\-\-gui\fP" +Use the default graphic interface +.IP "\fB\-\-shell\fP" +Use the default shell interface +.IP "\fB\-\-interface=NAME\fP" +Use the given interface +.IP "\fB\-\-ignore\-locks\fP" +Don't respect locking +.IP "\fB\-o OPT, \-\-option=OPT\fP" +Set the option given by a name=value pair +.SH "Examples" +.nf +smart install \-\-help +smart install pkgname +smart \-\-gui +smart \-\-gui install pkgname +smart \-\-shell +.fi +.SH "FILES" +.nf +/etc/smart/ +/var/lib/smart/ +/usr/lib/smart/ +/usr/lib/smart/plugins/ +.fi +.SH "SEE ALSO" +.nf +http://labix.org/smart +.fi +.SH "AUTHOR" +.nf +Gustavo Niemeyer <gustavo@niemeyer.net> +.fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/smart-0.41.99/setup.py new/smart-0.41.99/setup.py --- old/smart-0.41.99/setup.py 2006-06-15 21:17:08.000000000 +0200 +++ new/smart-0.41.99/setup.py 2006-06-16 17:50:02.000000000 +0200 @@ -40,7 +40,7 @@ I18NFILES = [] for filepath in glob.glob("locale/*/LC_MESSAGES/*.mo"): - targetpath = os.path.dirname(os.path.join(sys.prefix, "share", filepath)) + targetpath = os.path.dirname(os.path.join("share", filepath)) I18NFILES.append((targetpath, [filepath])) config_h = sysconfig.get_config_h_filename() @@ -112,6 +112,8 @@ ], data_files = I18NFILES + [(PYTHONLIB+"/smart/interfaces/images", - glob.glob("smart/interfaces/images/*.png"))], + glob.glob("smart/interfaces/images/*.png")), + ("share/man/man8/", glob.glob("doc/*.8")) + ] ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/smart-0.41.99/smart/backends/rpm/redcarpet.py new/smart-0.41.99/smart/backends/rpm/redcarpet.py --- old/smart-0.41.99/smart/backends/rpm/redcarpet.py 2006-06-15 21:17:04.000000000 +0200 +++ new/smart-0.41.99/smart/backends/rpm/redcarpet.py 2006-06-16 17:50:02.000000000 +0200 @@ -294,7 +294,7 @@ parser.StartElementHandler = self.startElement parser.EndElementHandler = self.endElement parser.CharacterDataHandler = self.charData - parser.returns_unicode = True + parser.returns_unicode = False self._lastoffset = 0 self._mod = 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/smart-0.41.99/smart/channels/yast2.py new/smart-0.41.99/smart/channels/yast2.py --- old/smart-0.41.99/smart/channels/yast2.py 2006-06-15 21:17:03.000000000 +0200 +++ new/smart-0.41.99/smart/channels/yast2.py 2006-06-16 13:47:39.000000000 +0200 @@ -62,7 +62,7 @@ # that says if the repository has changed fetchitem = posixpath.join(self._baseurl, "media.1/media") fetched = self.__fetchFile(fetchitem, fetcher, progress) - if not fetched: return False + if not fetched or fetched.getStatus() == FAILED: return False digest = getFileDigest(fetched.getTargetPath()) #if digest == self._digest and getattr(self, "force-yast", False): @@ -73,7 +73,7 @@ # Find location of description files fetchitem = posixpath.join(self._baseurl, "content") fetched = self.__fetchFile(fetchitem, fetcher, progress) - if not fetched: return False + if not fetched or fetched.getStatus() == FAILED: return False self.removeLoaders() descrdir = "suse/setup/descr" datadir = "RPMS" @@ -85,14 +85,14 @@ fetchitem = posixpath.join(self._baseurl, (("%s/packages") % descrdir)) fetched = self.__fetchFile(fetchitem, fetcher, progress) - if not fetched: return False + if not fetched or fetched.getStatus() == FAILED: return False self.removeLoaders() pkginfofile = fetched.getTargetPath() if open(pkginfofile).read(9) == "=Ver: 2.0": fetchitem = posixpath.join(self._baseurl, (("%s/packages.en") % descrdir)) fetched = self.__fetchFile(fetchitem, fetcher, progress) - if not fetched or open(fetched.getTargetPath()).read(9) != "=Ver: 2.0": + if not fetched or fetched.getStatus() == FAILED or open(fetched.getTargetPath()).read(9) != "=Ver: 2.0": raise Error, "YaST2 package descriptions not loaded." loader = YaST2Loader(self._baseurl, datadir, pkginfofile) else: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org