Hello community, here is the log from the commit of package rpmconf for openSUSE:Factory checked in at 2015-11-26 17:04:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmconf (Old) and /work/SRC/openSUSE:Factory/.rpmconf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpmconf" Changes: -------- --- /work/SRC/openSUSE:Factory/rpmconf/rpmconf.changes 2015-11-17 14:23:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpmconf.new/rpmconf.changes 2015-11-26 17:04:36.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Nov 25 20:45:35 UTC 2015 - [email protected] + +- Update to 1.0.14: + * Improve error message. + * Check for root privileges. + * Clarify man page. + +------------------------------------------------------------------- Old: ---- rpmconf-1.0.13.tar.gz New: ---- rpmconf-1.0.14.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmconf.spec ++++++ --- /var/tmp/diff_new_pack.kpIuAN/_old 2015-11-26 17:04:37.000000000 +0100 +++ /var/tmp/diff_new_pack.kpIuAN/_new 2015-11-26 17:04:37.000000000 +0100 @@ -17,7 +17,7 @@ Name: rpmconf -Version: 1.0.13 +Version: 1.0.14 Release: 0 Summary: Tool to handle rpmnew and rpmsave files License: GPL-3.0+ @@ -59,7 +59,8 @@ SPHINXBUILD=sphinx-build-%{py3_ver} %install -python3 setup.py install --skip-build \ +python3 setup.py install \ + --skip-build \ --root %{buildroot} \ --install-scripts %{_sbindir} ++++++ rpmconf-1.0.13.tar.gz -> rpmconf-1.0.14.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.0.13-1/bin/rpmconf new/rpmconf-rpmconf-1.0.14-1/bin/rpmconf --- old/rpmconf-rpmconf-1.0.13-1/bin/rpmconf 2015-11-13 16:56:44.000000000 +0100 +++ new/rpmconf-rpmconf-1.0.14-1/bin/rpmconf 2015-11-24 11:01:18.000000000 +0100 @@ -1,5 +1,5 @@ -#!/usr/bin/env python3 -# +#!/usr/bin/python3 +# -*- coding: utf-8 -*- # vim: noai:ts=4:sw=4:expandtab # # Copyright (C) 2015 Igor Gnatenko <[email protected]> @@ -19,7 +19,10 @@ """ Main script which will end up in /usr/sbin/rpmconf """ import argparse from rpmconf import rpmconf +import errno +import os import sys +import time def main(): """ Main entry point. """ @@ -57,7 +60,18 @@ clean=args.clean, debug=args.debug, diff=args.diff, frontend=args.frontend, selinux=args.selinux) - rconf.run() + if os.geteuid() != 0: + sys.stderr.write("Most features are not useful without root privileges!!!\n") + time.sleep(5) + + try: + rconf.run() + except IOError as err: + if err.errno in (errno.EACCES, errno.EPERM): + sys.stderr.write("Error: You need root permissions to do this!\n") + sys.exit(1) + else: + raise if __name__ == "__main__": main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.0.13-1/docs/source/conf.py new/rpmconf-rpmconf-1.0.14-1/docs/source/conf.py --- old/rpmconf-rpmconf-1.0.13-1/docs/source/conf.py 2015-11-13 16:56:44.000000000 +0100 +++ new/rpmconf-rpmconf-1.0.14-1/docs/source/conf.py 2015-11-24 11:01:18.000000000 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # rpmconf documentation build configuration file, created by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.0.13-1/rel-eng/packages/rpmconf new/rpmconf-rpmconf-1.0.14-1/rel-eng/packages/rpmconf --- old/rpmconf-rpmconf-1.0.13-1/rel-eng/packages/rpmconf 2015-11-13 16:56:44.000000000 +0100 +++ new/rpmconf-rpmconf-1.0.14-1/rel-eng/packages/rpmconf 2015-11-24 11:01:18.000000000 +0100 @@ -1 +1 @@ -1.0.13-1 ./ +1.0.14-1 ./ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.0.13-1/rpmconf/rpmconf.py new/rpmconf-rpmconf-1.0.14-1/rpmconf/rpmconf.py --- old/rpmconf-rpmconf-1.0.13-1/rpmconf/rpmconf.py 2015-11-13 16:56:44.000000000 +0100 +++ new/rpmconf-rpmconf-1.0.14-1/rpmconf/rpmconf.py 2015-11-24 11:01:18.000000000 +0100 @@ -1,5 +1,5 @@ -#!/usr/bin/env python3 -# +#!/usr/bin/python3 +# -*- coding: utf-8 -*- # vim: noai:ts=4:sw=4:expandtab # pylint: disable=missing-docstring,too-many-arguments,too-many-branches # @@ -243,7 +243,8 @@ print(repr(merge_tool)) subprocess.check_call([merge_tool, conf_file, other_file]) else: - self.logger.error("You did not selected any frontend for merge") + self.logger.error("You did not selected any frontend for merge.\n" + + " Define it with environment variable 'MERGE' or flag -f.") sys.exit(2) except FileNotFoundError as err: sys.stderr.write("{0}\n".format(err.strerror)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.0.13-1/rpmconf.sgml new/rpmconf-rpmconf-1.0.14-1/rpmconf.sgml --- old/rpmconf-rpmconf-1.0.13-1/rpmconf.sgml 2015-11-13 16:56:44.000000000 +0100 +++ new/rpmconf-rpmconf-1.0.14-1/rpmconf.sgml 2015-11-24 11:01:18.000000000 +0100 @@ -26,10 +26,10 @@ <arg>-a, --all</arg> </cmdsynopsis> <cmdsynopsis> - <arg>-o<replaceable>package</replaceable>, --owner=<replaceable>package</replaceable></arg> + <arg>-o<replaceable><package></replaceable>, --owner=<replaceable><package></replaceable></arg> </cmdsynopsis> <cmdsynopsis> - <arg>-f<replaceable>type</replaceable> --frontend=<replaceable>type</replaceable></arg> + <arg>-f<replaceable><type></replaceable> --frontend=<replaceable><type></replaceable></arg> </cmdsynopsis> <cmdsynopsis> <arg>-c, --clean</arg> @@ -76,13 +76,13 @@ </listitem> </varlistentry> <varlistentry> - <term>-opackage, --owner=package</term> + <term>-o<package>, --owner=<package></term> <listitem> <para>Check only configuration files of given package.</para> </listitem> </varlistentry> <varlistentry> - <term>-ftype, --frontend=type</term> + <term>-f<type>, --frontend=<type></term> <listitem> <para>Define which frontend should be used for merging. Valid options are: vimdiff, gvimdiff, diffuse, kdiff3, meld and env. When set to env, the command to use is taken from the environment variable $MERGE. The default is env.</para> </listitem> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.0.13-1/rpmconf.spec new/rpmconf-rpmconf-1.0.14-1/rpmconf.spec --- old/rpmconf-rpmconf-1.0.13-1/rpmconf.spec 2015-11-13 16:56:44.000000000 +0100 +++ new/rpmconf-rpmconf-1.0.14-1/rpmconf.spec 2015-11-24 11:01:18.000000000 +0100 @@ -1,7 +1,7 @@ Name: rpmconf Summary: Tool to handle rpmnew and rpmsave files License: GPLv3 -Version: 1.0.13 +Version: 1.0.14 Release: 1%{?dist} URL: http://wiki.github.com/xsuchy/rpmconf # source is created by: @@ -92,6 +92,13 @@ %dir %{_datadir}/rpmconf %changelog +* Tue Nov 24 2015 Miroslav Suchý <[email protected]> 1.0.14-1 +- we use utf8 +- call python3 directly +- 1258464 - improve error message +- 1282029 - check for root privileges +- 1283698 - clarify man page + * Fri Nov 13 2015 Miroslav Suchý <[email protected]> 1.0.13-1 - 1278134 - do TB when somebody remove file under our hand diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.0.13-1/setup.py new/rpmconf-rpmconf-1.0.14-1/setup.py --- old/rpmconf-rpmconf-1.0.13-1/setup.py 2015-11-13 16:56:44.000000000 +0100 +++ new/rpmconf-rpmconf-1.0.14-1/setup.py 2015-11-24 11:01:18.000000000 +0100 @@ -4,7 +4,7 @@ setup(name = "rpmconf", packages = ["rpmconf"], - version = "1.0.13", + version = "1.0.14", description = "Handle rpmnew and rpmsave files", author = "Igor Gnatenko", author_email = "[email protected]",
