April 2014 - openSUSE Commits - openSUSE Mailing Lists

commit duperemove for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '14

25 Apr '14

Hello community, here is the log from the commit of package duperemove for openSUSE:Factory checked in at 2014-04-25 11:34:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/duperemove (Old) and /work/SRC/openSUSE:Factory/.duperemove.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "duperemove" Changes: -------- --- /work/SRC/openSUSE:Factory/duperemove/duperemove.changes 2014-04-13 13:14:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.duperemove.new/duperemove.changes 2014-04-25 11:34:04.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Apr 20 22:13:45 UTC 2014 - mfasheh(a)suse.com + +- update to duperemove v0.08 + - fixes many bugs + - a few more usability improvements + - adds fiemap support to better estimate space savings + +------------------------------------------------------------------- Old: ---- duperemove-v0.07.tar.gz New: ---- duperemove-v0.08.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ duperemove.spec ++++++ --- /var/tmp/diff_new_pack.FYfHI4/_old 2014-04-25 11:34:05.000000000 +0200 +++ /var/tmp/diff_new_pack.FYfHI4/_new 2014-04-25 11:34:05.000000000 +0200 @@ -21,7 +21,7 @@ Name: duperemove BuildRequires: gcc-c++ BuildRequires: libgcrypt-devel -Version: 0.07 +Version: 0.08 Release: 0 Summary: Software to find duplicate extents in files and remove them License: GPL-2.0 ++++++ duperemove-v0.07.tar.gz -> duperemove-v0.08.tar.gz ++++++ ++++ 1684 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dispcalGUI for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '14

25 Apr '14

Hello community, here is the log from the commit of package dispcalGUI for openSUSE:Factory checked in at 2014-04-25 11:33:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dispcalGUI (Old) and /work/SRC/openSUSE:Factory/.dispcalGUI.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dispcalGUI" Changes: -------- --- /work/SRC/openSUSE:Factory/dispcalGUI/dispcalGUI.changes 2014-02-19 06:54:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dispcalGUI.new/dispcalGUI.changes 2014-04-25 11:34:00.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 23 02:16:43 UTC 2014 - dispcalGUI(a)hoech.net + +- update to 2.0.0.0: see README.html#changelog-2.0.0.0 + +------------------------------------------------------------------- Old: ---- dispcalGUI-1.7.5.7.tar.gz New: ---- dispcalGUI-2.0.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dispcalGUI.spec ++++++ --- /var/tmp/diff_new_pack.fK49rx/_old 2014-04-25 11:34:01.000000000 +0200 +++ /var/tmp/diff_new_pack.fK49rx/_new 2014-04-25 11:34:01.000000000 +0200 @@ -26,7 +26,7 @@ License: GPL-3.0+ Group: Applications/Multimedia Name: dispcalGUI -Version: 1.7.5.7 +Version: 2.0.0.0 Release: 0 Source0: http://%{name}.hoech.net/download/%{name}-%version.tar.gz Source1: copyright @@ -48,6 +48,7 @@ %if 0%{?suse_version} > 0 BuildRequires: gcc BuildRequires: python-devel +BuildRequires: python-xml BuildRequires: udev BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel ++++++ copyright ++++++ --- /var/tmp/diff_new_pack.fK49rx/_old 2014-04-25 11:34:01.000000000 +0200 +++ /var/tmp/diff_new_pack.fK49rx/_new 2014-04-25 11:34:01.000000000 +0200 @@ -1,7 +1,7 @@ Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 Name: dispcalGUI Maintainer: Florian Höch <dispcalGUI(a)hoech.net> -Source: http://dispcalGUI.hoech.net/ +Source: http://dispcalgui.hoech.net/ Copyright: 2008-2014, Florian Höch <dispcalGUI(a)hoech.net> License: GPL-3+ ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.fK49rx/_old 2014-04-25 11:34:01.000000000 +0200 +++ /var/tmp/diff_new_pack.fK49rx/_new 2014-04-25 11:34:01.000000000 +0200 @@ -1,5 +1,5 @@ -dispcalgui (1.7.5.7) stable; urgency=low +dispcalgui (2.0.0.0) stable; urgency=low - * Version 1.7.5.7 + * Version 2.0.0.0 - -- Florian Höch <dispcalGUI(a)hoech.net> Sun, 09 Feb 2014 22:34:19 +0100 + -- Florian Höch <dispcalGUI(a)hoech.net> Wed, 23 Apr 2014 02:16:43 +0100 ++++++ debian.control ++++++ --- /var/tmp/diff_new_pack.fK49rx/_old 2014-04-25 11:34:01.000000000 +0200 +++ /var/tmp/diff_new_pack.fK49rx/_new 2014-04-25 11:34:01.000000000 +0200 @@ -8,7 +8,7 @@ Package: dispcalgui Architecture: any Depends: ${shlibs:Depends}, ${python:Depends}, python-wxgtk2.8 (>= 2.8.6), python-numpy (>= 1.0) -Recommends: argyll, gir1.2-colord-1.0 +Recommends: argyll Description: A graphical front-end for display calibration and profiling using Argyll CMS Calibrates and characterizes display devices using a hardware sensor, driven by the open source color management system Argyll CMS. ++++++ debian.rules ++++++ --- /var/tmp/diff_new_pack.fK49rx/_old 2014-04-25 11:34:01.000000000 +0200 +++ /var/tmp/diff_new_pack.fK49rx/_new 2014-04-25 11:34:01.000000000 +0200 @@ -19,7 +19,7 @@ # The DESTDIR Has To Be Exactly /usr/src/packages/BUILD/debian/<nameOfPackage> export name=dispcalGUI -export version=1.7.5.7 +export version=2.0.0.0 export DEB_BUILD_ROOT=/usr/src/packages/BUILD/debian/dispcalgui export install_prefix=/usr export install_exec_prefix=/usr ++++++ dispcalGUI-1.7.5.7.tar.gz -> dispcalGUI-2.0.0.0.tar.gz ++++++ ++++ 17738 lines of diff (skipped) ++++++ dispcalGUI.dsc ++++++ --- /var/tmp/diff_new_pack.fK49rx/_old 2014-04-25 11:34:01.000000000 +0200 +++ /var/tmp/diff_new_pack.fK49rx/_new 2014-04-25 11:34:01.000000000 +0200 @@ -1,11 +1,11 @@ -Debtransform-Tar: dispcalGUI-1.7.5.7.tar.gz +Debtransform-Tar: dispcalGUI-2.0.0.0.tar.gz Format: 1.0 Source: dispcalgui -Version: 1.7.5.7 +Version: 2.0.0.0 Binary: dispcalgui Maintainer: Florian Höch <dispcalGUI(a)hoech.net> Architecture: any Build-Depends: debhelper (>= 5.0.38), doc-base, gcc, python-dev, libxinerama-dev, libxrandr-dev, libxxf86vm-dev Files: - ffffffffffffffffffffffffffffffff 1 dispcalgui_1.7.5.7.orig.tar.gz - ffffffffffffffffffffffffffffffff 1 dispcalgui_1.7.5.7-1.diff.tar.gz + ffffffffffffffffffffffffffffffff 1 dispcalgui_2.0.0.0.orig.tar.gz + ffffffffffffffffffffffffffffffff 1 dispcalgui_2.0.0.0-1.diff.tar.gz -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cmocka for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '14

25 Apr '14

Hello community, here is the log from the commit of package cmocka for openSUSE:Factory checked in at 2014-04-25 11:33:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmocka (Old) and /work/SRC/openSUSE:Factory/.cmocka.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cmocka" Changes: -------- --- /work/SRC/openSUSE:Factory/cmocka/cmocka.changes 2013-11-19 10:44:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cmocka.new/cmocka.changes 2014-04-25 11:33:52.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Apr 11 14:16:07 UTC 2014 - asn(a)cryptomilk.org + +- Update to version 0.4.0 + * Added support for group testing. + * Added assert_return_code(). + * Added better messages for errors. + * Added cmake config mode support. + * Fixed bug with unit_test_setup and unit_test_teardown. + * Fixed a lot of small bugs. + +------------------------------------------------------------------- Old: ---- cmocka-0.3.2.tar.xz New: ---- cmocka-0.4.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmocka.spec ++++++ --- /var/tmp/diff_new_pack.CZmLRS/_old 2014-04-25 11:33:53.000000000 +0200 +++ /var/tmp/diff_new_pack.CZmLRS/_new 2014-04-25 11:33:53.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package cmocka # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ BuildRequires: glibc-devel Name: cmocka -Version: 0.3.2 +Version: 0.4.0 Release: 0 # Summary: Lightweight library to simplify and generalize unit tests for C @@ -99,10 +99,10 @@ %setup -q %build -if test ! -e "build"; then - mkdir build +if test ! -e "obj"; then + mkdir obj fi -pushd build +pushd obj cmake \ -DCMAKE_C_FLAGS:STRING="%{optflags}" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -115,10 +115,10 @@ %{_builddir}/%{name}-%{version} make %{?_smp_mflags} VERBOSE=1 -popd build +popd obj %install -pushd build +pushd obj %makeinstall popd @@ -141,6 +141,8 @@ %{_includedir}/cmocka.h %{_libdir}/libcmocka.so %{_libdir}/pkgconfig/cmocka.pc +%{_libdir}/cmake/cmocka-config-version.cmake +%{_libdir}/cmake/cmocka-config.cmake %files -n libcmocka-devel-static %defattr(-,root,root) ++++++ cmocka-0.3.2.tar.xz -> cmocka-0.4.0.tar.xz ++++++ ++++ 5779 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cluster-glue for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '14

25 Apr '14

Hello community, here is the log from the commit of package cluster-glue for openSUSE:Factory checked in at 2014-04-25 11:33:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old) and /work/SRC/openSUSE:Factory/.cluster-glue.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cluster-glue" Changes: -------- --- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes 2014-04-03 16:38:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes 2014-04-25 11:33:44.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Apr 11 14:38:34 UTC 2014 - kgronlund(a)suse.com + +- hb_report: pcmk lib changed permissions (bnc#872958) + +- added patches: + * Low-hb_report-pcmk-lib-changed-permissions.patch + +------------------------------------------------------------------- New: ---- Low-hb_report-pcmk-lib-changed-permissions.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cluster-glue.spec ++++++ --- /var/tmp/diff_new_pack.FkFhDW/_old 2014-04-25 11:33:45.000000000 +0200 +++ /var/tmp/diff_new_pack.FkFhDW/_new 2014-04-25 11:33:45.000000000 +0200 @@ -55,6 +55,8 @@ Patch9: 0001-hb_report-Don-t-use-deprecated-corosync-fplay-bnc-87.patch # PATCH-FIX-UPSTREAM: hb_report: Update FSF address in license Patch10: 0002-hb_report-Update-FSF-address-in-license.patch +# PATCH-FIX-UPSTREAM: hb_report: pcmk lib changed permissions (bnc#872958) +Patch11: Low-hb_report-pcmk-lib-changed-permissions.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: OpenIPMI-devel @@ -164,6 +166,7 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 ########################################################### %build ++++++ Low-hb_report-pcmk-lib-changed-permissions.patch ++++++ changeset: 2782:2d376c7eb9d7 parent: 2778:b5f160509785 user: Dejan Muhamedagic <dejan(a)hello-penguin.com> date: Thu Apr 10 15:02:10 2014 +0200 summary: Low: hb_report: pcmk lib changed permissions diff --git a/hb_report/ha_cf_support.sh b/hb_report/ha_cf_support.sh --- a/hb_report/ha_cf_support.sh +++ b/hb_report/ha_cf_support.sh @@ -76,7 +76,7 @@ essential_files() { cat<<EOF d $HA_VARLIB 0755 root root d $HA_VARLIB/ccm 0750 hacluster haclient -d $PCMK_LIB 0755 root root +d $PCMK_LIB 0750 hacluster haclient d $PE_STATE_DIR 0750 hacluster haclient d $CIB_DIR 0750 hacluster haclient EOF diff --git a/hb_report/openais_conf_support.sh b/hb_report/openais_conf_support.sh --- a/hb_report/openais_conf_support.sh +++ b/hb_report/openais_conf_support.sh @@ -90,7 +90,7 @@ cluster_info() { } essential_files() { cat<<EOF -d $PCMK_LIB 0755 root root +d $PCMK_LIB 0750 hacluster haclient d $PE_STATE_DIR 0750 hacluster haclient d $CIB_DIR 0750 hacluster haclient EOF -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit iproute2 for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '14

25 Apr '14

Hello community, here is the log from the commit of package iproute2 for openSUSE:Factory checked in at 2014-04-25 11:33:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iproute2 (Old) and /work/SRC/openSUSE:Factory/.iproute2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "iproute2" Changes: -------- --- /work/SRC/openSUSE:Factory/iproute2/iproute2.changes 2013-12-19 12:40:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.iproute2.new/iproute2.changes 2014-04-25 11:33:42.000000000 +0200 @@ -1,0 +2,19 @@ +Wed Apr 16 19:46:36 UTC 2014 - jengelh(a)inai.de + +- Update to new upstream release 3.14 +* ip link: support for High Availability Seamless Redundancy + (HSR) network devices. +* ip link: support for creating/deleting bonding devices +* ip link: support for specifying interface indexes during + creation of devices +* tc/pkt_sched: add support for the "FQ" Fair Queue packet scheduler +* tc: support for the BPF-based traffic classifier +* tc, netem: support 64-bit quantity rate speeds +* tc: support for the new "PIE" Proportional Integral controller + Enhanced scheduler +* ss: display PF_LOCAL-SOCK_SEQPACKET sockets as such rather than + SOCK_DGRAM +* ss: display zone names when so needed +* ss: add support for retrieving SELinux contexts + +------------------------------------------------------------------- Old: ---- iproute2-3.12.0.tar.sign iproute2-3.12.0.tar.xz New: ---- iproute2-3.14.0.tar.sign iproute2-3.14.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iproute2.spec ++++++ --- /var/tmp/diff_new_pack.3J7mxh/_old 2014-04-25 11:33:43.000000000 +0200 +++ /var/tmp/diff_new_pack.3J7mxh/_new 2014-04-25 11:33:43.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package iproute2 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,9 @@ Name: iproute2 -Version: 3.12 +Version: 3.14 Release: 0 -%define rversion 3.12.0 +%define rversion 3.14.0 Summary: Linux network configuration utilities License: GPL-2.0 Group: Productivity/Networking/Routing @@ -68,8 +68,10 @@ %define with_xt 1 %if 0%{?with_xt} %if 0%{?suse_version} >= 1140 +BuildRequires: pkgconfig(libselinux) BuildRequires: pkgconfig(xtables) >= 1.4.11 %else +BuildRequires: libselinux-devel BuildRequires: libxtables-devel >= 1.4.11 %endif %endif ++++++ iproute2-3.12.0.tar.xz -> iproute2-3.14.0.tar.xz ++++++ ++++ 5155 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libsolv for openSUSE:Factory
by root＠hilbert.suse.de 25 Apr '14

25 Apr '14

Hello community, here is the log from the commit of package libsolv for openSUSE:Factory checked in at 2014-04-25 11:33:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsolv (Old) and /work/SRC/openSUSE:Factory/.libsolv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsolv" Changes: -------- --- /work/SRC/openSUSE:Factory/libsolv/libsolv.changes 2014-04-13 13:13:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsolv.new/libsolv.changes 2014-04-25 11:33:41.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Apr 17 14:47:42 CEST 2014 - mls(a)suse.de + +- support BREAK_ORPHANS and KEEP_ORPHANS solver flags +- adapt to AppStream 0.6 +- reduce memory usage in repo_write and repodata_internalize +- make repodata_stringify return the result string +- bump version to 0.6.1 + +------------------------------------------------------------------- Old: ---- libsolv-0.6.0.tar.bz2 New: ---- libsolv-0.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsolv.spec ++++++ --- /var/tmp/diff_new_pack.aZtVY8/_old 2014-04-25 11:33:42.000000000 +0200 +++ /var/tmp/diff_new_pack.aZtVY8/_new 2014-04-25 11:33:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: libsolv -Version: 0.6.0 +Version: 0.6.1 Release: 0 Url: git://gitorious.org/opensuse/libsolv.git Source: libsolv-%{version}.tar.bz2 ++++++ libsolv-0.6.0.tar.bz2 -> libsolv-0.6.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.0/VERSION.cmake new/libsolv-0.6.1/VERSION.cmake --- old/libsolv-0.6.0/VERSION.cmake 2014-04-07 15:45:11.000000000 +0200 +++ new/libsolv-0.6.1/VERSION.cmake 2014-04-17 14:50:44.000000000 +0200 @@ -49,5 +49,5 @@ SET(LIBSOLV_MAJOR "0") SET(LIBSOLV_MINOR "6") -SET(LIBSOLV_PATCH "0") +SET(LIBSOLV_PATCH "1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.0/ext/repo_appdata.c new/libsolv-0.6.1/ext/repo_appdata.c --- old/libsolv-0.6.0/ext/repo_appdata.c 2014-03-05 15:50:54.000000000 +0100 +++ new/libsolv-0.6.1/ext/repo_appdata.c 2014-04-17 11:25:45.000000000 +0200 @@ -62,7 +62,9 @@ /* !! must be sorted by first column !! */ static struct stateswitch stateswitches[] = { { STATE_START, "applications", STATE_START, 0 }, + { STATE_START, "components", STATE_START, 0 }, { STATE_START, "application", STATE_APPLICATION, 0 }, + { STATE_START, "component", STATE_APPLICATION, 0 }, { STATE_APPLICATION, "id", STATE_ID, 1 }, { STATE_APPLICATION, "pkgname", STATE_PKGNAME, 1 }, { STATE_APPLICATION, "product_license", STATE_LICENCE, 1 }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.0/ext/repo_content.c new/libsolv-0.6.1/ext/repo_content.c --- old/libsolv-0.6.0/ext/repo_content.c 2014-03-12 15:35:49.000000000 +0100 +++ new/libsolv-0.6.1/ext/repo_content.c 2014-04-16 14:00:44.000000000 +0200 @@ -408,7 +408,6 @@ } /* create new solvable */ s = pool_id2solvable(pool, repo_add_solvable(repo)); - repodata_extend(data, s - pool->solvables); handle = s - pool->solvables; s->name = pool_str2id(pool, join(&pd, "product", ":", value), 1); if (datadir) @@ -425,7 +424,6 @@ if (!s) { s = pool_id2solvable(pool, repo_add_solvable(repo)); - repodata_extend(data, s - pool->solvables); handle = s - pool->solvables; } @@ -546,7 +544,6 @@ for (i = 0; i < numotherarchs; ++i) { Solvable *p = pool_id2solvable(pool, repo_add_solvable(repo)); - repodata_extend(data, p - pool->solvables); p->name = s->name; p->evr = s->evr; p->vendor = s->vendor; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.0/ext/repo_rpmdb.c new/libsolv-0.6.1/ext/repo_rpmdb.c --- old/libsolv-0.6.0/ext/repo_rpmdb.c 2014-04-07 13:07:13.000000000 +0200 +++ new/libsolv-0.6.1/ext/repo_rpmdb.c 2014-04-15 18:15:59.000000000 +0200 @@ -1045,6 +1045,7 @@ DB_ENV *dbenv; /* database environment */ DB *db; /* packages database */ int byteswapped; /* endianess of packages database */ + int is_ostree; /* read-only db that lives in /usr/share/rpm */ }; struct rpmdbentry { @@ -1135,6 +1136,10 @@ snprintf(dbpath, PATH_MAX, "%s/var/lib/rpm", rootdir ? rootdir : ""); if (access(dbpath, W_OK) == -1) { + snprintf(dbpath, PATH_MAX, "%s/usr/share/rpm/Packages", rootdir ? rootdir : ""); + if (access(dbpath, R_OK) == 0) + state->is_ostree = 1; + snprintf(dbpath, PATH_MAX, "%s%s", rootdir ? rootdir : "", state->is_ostree ? "/usr/share/rpm" : "/var/lib/rpm"); r = dbenv->open(dbenv, dbpath, DB_CREATE|DB_PRIVATE|DB_INIT_MPOOL, 0); } else @@ -1448,7 +1453,7 @@ DBT dbkey; DBT dbdata; - snprintf(dbpath, PATH_MAX, "%s/var/lib/rpm/Name", state->rootdir ? state->rootdir : ""); + snprintf(dbpath, PATH_MAX, "%s%s/Name", state->rootdir ? state->rootdir : "", state->is_ostree ? "/usr/share/rpm" : "/var/lib/rpm"); if (stat(dbpath, &statbuf)) return 0; memset(&dbkey, 0, sizeof(dbkey)); @@ -1766,7 +1771,7 @@ } /* XXX: should get ro lock of Packages database! */ - snprintf(dbpath, PATH_MAX, "%s/var/lib/rpm/Packages", state.rootdir ? state.rootdir : ""); + snprintf(dbpath, PATH_MAX, "%s%s/Packages", state.rootdir ? state.rootdir : "", state.is_ostree ? "/usr/share/rpm" : "/var/lib/rpm"); if (stat(dbpath, &packagesstat)) { pool_error(pool, -1, "%s: %s", dbpath, strerror(errno)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.0/ext/repo_zyppdb.c new/libsolv-0.6.1/ext/repo_zyppdb.c --- old/libsolv-0.6.0/ext/repo_zyppdb.c 2014-03-05 15:50:54.000000000 +0100 +++ new/libsolv-0.6.1/ext/repo_zyppdb.c 2014-04-16 14:00:44.000000000 +0200 @@ -161,7 +161,6 @@ /* parse 'type' */ const char *type = find_attr("type", atts); s = pd->solvable = pool_id2solvable(pool, repo_add_solvable(pd->repo)); - repodata_extend(pd->data, s - pool->solvables); pd->handle = s - pool->solvables; if (type) repodata_set_str(pd->data, pd->handle, PRODUCT_TYPE, type); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.0/ext/testcase.c new/libsolv-0.6.1/ext/testcase.c --- old/libsolv-0.6.0/ext/testcase.c 2014-04-07 12:55:11.000000000 +0200 +++ new/libsolv-0.6.1/ext/testcase.c 2014-04-16 15:20:44.000000000 +0200 @@ -102,6 +102,8 @@ { SOLVER_FLAG_DUP_ALLOW_ARCHCHANGE, "dupallowarchchange", 1 }, { SOLVER_FLAG_DUP_ALLOW_VENDORCHANGE, "dupallowvendorchange", 1 }, { SOLVER_FLAG_DUP_ALLOW_NAMECHANGE, "dupallownamechange", 1 }, + { SOLVER_FLAG_KEEP_ORPHANS, "keeporphans", 0 }, + { SOLVER_FLAG_BREAK_ORPHANS, "breakorphans", 0 }, { 0, 0, 0 } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.0/package/libsolv.changes new/libsolv-0.6.1/package/libsolv.changes --- old/libsolv-0.6.0/package/libsolv.changes 2014-04-07 15:45:11.000000000 +0200 +++ new/libsolv-0.6.1/package/libsolv.changes 2014-04-17 14:50:44.000000000 +0200 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Thu Apr 17 14:47:42 CEST 2014 - mls(a)suse.de + +- support BREAK_ORPHANS and KEEP_ORPHANS solver flags +- adapt to AppStream 0.6 +- reduce memory usage in repo_write and repodata_internalize +- make repodata_stringify return the result string +- bump version to 0.6.1 + +------------------------------------------------------------------- Mon Apr 7 15:36:07 CEST 2014 - mls(a)suse.de - add support for sha224/sha384/sha512 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.0/src/pool.c new/libsolv-0.6.1/src/pool.c --- old/libsolv-0.6.0/src/pool.c 2014-02-18 13:10:52.000000000 +0100 +++ new/libsolv-0.6.1/src/pool.c 2014-04-14 19:10:44.000000000 +0200 @@ -1296,8 +1296,6 @@ struct searchfiles { Id *ids; - char **dirs; - char **names; int nfiles; Map seen; }; @@ -1308,7 +1306,7 @@ pool_addfileprovides_dep(Pool *pool, Id *ida, struct searchfiles *sf, struct searchfiles *isf) { Id dep, sid; - const char *s, *sr; + const char *s; struct searchfiles *csf; while ((dep = *ida++) != 0) @@ -1366,16 +1364,7 @@ if (csf != isf && pool->addedfileprovides == 1 && !repodata_filelistfilter_matches(0, s)) continue; /* skip non-standard locations csf == isf: installed case */ csf->ids = solv_extend(csf->ids, csf->nfiles, 1, sizeof(Id), SEARCHFILES_BLOCK); - csf->dirs = solv_extend(csf->dirs, csf->nfiles, 1, sizeof(const char *), SEARCHFILES_BLOCK); - csf->names = solv_extend(csf->names, csf->nfiles, 1, sizeof(const char *), SEARCHFILES_BLOCK); - csf->ids[csf->nfiles] = dep; - sr = strrchr(s, '/'); - csf->names[csf->nfiles] = solv_strdup(sr + 1); - csf->dirs[csf->nfiles] = solv_malloc(sr - s + 1); - if (sr != s) - strncpy(csf->dirs[csf->nfiles], s, sr - s); - csf->dirs[csf->nfiles][sr - s] = 0; - csf->nfiles++; + csf->ids[csf->nfiles++] = dep; } } @@ -1401,6 +1390,19 @@ if (!cbd->useddirs.size) { map_init(&cbd->useddirs, data->dirpool.ndirs + 1); + if (!cbd->dirs) + { + cbd->dirs = solv_malloc2(cbd->nfiles, sizeof(char *)); + cbd->names = solv_malloc2(cbd->nfiles, sizeof(char *)); + for (i = 0; i < cbd->nfiles; i++) + { + char *s = solv_strdup(pool_id2str(data->repo->pool, cbd->ids[i])); + cbd->dirs[i] = s; + s = strrchr(s, '/'); + *s = 0; + cbd->names[i] = s + 1; + } + } for (i = 0; i < cbd->nfiles; i++) { Id did; @@ -1419,15 +1421,8 @@ if (value->id >= data->dirpool.ndirs || !MAPTST(&cbd->useddirs, value->id)) return 0; for (i = 0; i < cbd->nfiles; i++) - { - if (cbd->dids[i] != value->id) - continue; - if (!strcmp(cbd->names[i], value->str)) - break; - } - if (i == cbd->nfiles) - return 0; - s->provides = repo_addid_dep(s->repo, s->provides, cbd->ids[i], SOLVABLE_FILEMARKER); + if (cbd->dids[i] == value->id && !strcmp(cbd->names[i], value->str)) + s->provides = repo_addid_dep(s->repo, s->provides, cbd->ids[i], SOLVABLE_FILEMARKER); return 0; } @@ -1448,8 +1443,8 @@ cbd->nfiles = sf->nfiles; cbd->ids = sf->ids; - cbd->dirs = sf->dirs; - cbd->names = sf->names; + cbd->dirs = 0; + cbd->names = 0; cbd->dids = solv_realloc2(cbd->dids, sf->nfiles, sizeof(Id)); map_init(&cbd->providedids, pool->ss.nstrings); @@ -1553,6 +1548,13 @@ map_free(&donemap); queue_free(&fileprovidesq); map_free(&cbd->providedids); + if (cbd->dirs) + { + for (i = 0; i < cbd->nfiles; i++) + solv_free(cbd->dirs[i]); + cbd->dirs = solv_free(cbd->dirs); + cbd->names = solv_free(cbd->names); + } } void @@ -1616,13 +1618,6 @@ for (i = 0; i < sf.nfiles; i++) queue_push(idqinst, sf.ids[i]); solv_free(sf.ids); - for (i = 0; i < sf.nfiles; i++) - { - solv_free(sf.dirs[i]); - solv_free(sf.names[i]); - } - solv_free(sf.dirs); - solv_free(sf.names); } if (isf.nfiles) { @@ -1636,13 +1631,6 @@ for (i = 0; i < isf.nfiles; i++) queue_pushunique(idqinst, isf.ids[i]); solv_free(isf.ids); - for (i = 0; i < isf.nfiles; i++) - { - solv_free(isf.dirs[i]); - solv_free(isf.names[i]); - } - solv_free(isf.dirs); - solv_free(isf.names); } solv_free(cbd.dids); pool_freewhatprovides(pool); /* as we have added provides */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.0/src/problems.c new/libsolv-0.6.1/src/problems.c --- old/libsolv-0.6.0/src/problems.c 2014-04-04 18:50:12.000000000 +0200 +++ new/libsolv-0.6.1/src/problems.c 2014-04-17 14:20:44.000000000 +0200 @@ -160,6 +160,10 @@ continue; solver_enablerule(solv, r); } + /* make sure broken orphan rules stay disabled */ + if (solv->brokenorphanrules) + for (i = 0; i < solv->brokenorphanrules->count; i++) + solver_disablerule(solv, solv->rules + solv->brokenorphanrules->elements[i]); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.0/src/repodata.c new/libsolv-0.6.1/src/repodata.c --- old/libsolv-0.6.0/src/repodata.c 2014-04-08 19:10:14.000000000 +0200 +++ new/libsolv-0.6.1/src/repodata.c 2014-04-16 14:00:44.000000000 +0200 @@ -2102,6 +2102,7 @@ return; if (!data->incoreoffset) { + /* this also means that data->attrs is NULL */ data->incoreoffset = solv_calloc_block(num, sizeof(Id), REPODATA_BLOCK); data->start = start; data->end = start + num; @@ -2812,6 +2813,10 @@ Id *tmpattrs; if (!data->attrs || dest == src) return; + if (dest < data->start || dest >= data->end) + repodata_extend(data, dest); + if (src < data->start || src >= data->end) + repodata_extend(data, src); tmpattrs = data->attrs[dest - data->start]; data->attrs[dest - data->start] = data->attrs[src - data->start]; data->attrs[src - data->start] = tmpattrs; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.0/src/rules.c new/libsolv-0.6.1/src/rules.c --- old/libsolv-0.6.0/src/rules.c 2014-04-04 16:30:12.000000000 +0200 +++ new/libsolv-0.6.1/src/rules.c 2014-04-17 14:20:44.000000000 +0200 @@ -1246,6 +1246,13 @@ } #endif + if (!allow_all && !p && solv->dupmap_all) + { + queue_push(&solv->orphaned, s - pool->solvables); /* an orphaned package */ + if (solv->keep_orphans) + p = s - pool->solvables; + } + if (!allow_all && qs.count && solv->multiversion.size) { int i, j; @@ -1286,7 +1293,7 @@ } if (j == 0 && p == -SYSTEMSOLVABLE && solv->dupmap_all) { - queue_push(&solv->orphaned, s - pool->solvables); /* treat as orphaned */ + queue_push(&solv->orphaned, s - pool->solvables); /* also treat as orphaned */ j = qs.count; } qs.count = j; @@ -4322,4 +4329,96 @@ map_free(&cleandepsmap); } -/* EOF */ + +void +solver_breakorphans(Solver *solv) +{ + Pool *pool = solv->pool; + Repo *installed = solv->installed; + int i, rid; + Map m; + + if (!installed || solv->droporphanedmap_all) + return; + solv->brokenorphanrules = solv_calloc(1, sizeof(Queue)); + queue_init(solv->brokenorphanrules); + map_init(&m, installed->end - installed->start); + for (i = 0; i < solv->orphaned.count; i++) + { + Id p = solv->orphaned.elements[i]; + if (pool->solvables[p].repo != installed) + continue; + if (solv->droporphanedmap.size && MAPTST(&solv->droporphanedmap, p - installed->start)) + continue; + MAPSET(&m, p - installed->start); + } + for (rid = 1; rid < solv->rpmrules_end ; rid++) + { + Id p, *dp; + Rule *r = solv->rules + rid; + /* ignore non-deps and simple conflicts */ + if (r->p >= 0 || ((r->d == 0 || r->d == -1) && r->w2 < 0)) + continue; + p = -r->p; + if (p < installed->start || p >= installed->end || !MAPTST(&m, p - installed->start)) + { + /* need to check other literals */ + if (r->d == 0 || r->d == -1) + continue; + for (dp = pool->whatprovidesdata + (r->d < 0 ? -r->d - 1 : r->d); *dp < 0; dp++) + { + p = -*dp; + if (p >= installed->start && p < installed->end && MAPTST(&m, p - installed->start)) + break; + } + if (*dp >= 0) + continue; + } + /* ok, disable this rule */ + queue_push(solv->brokenorphanrules, rid); + if (r->d >= 0) + solver_disablerule(solv, r); + } + map_free(&m); + if (!solv->brokenorphanrules->count) + { + queue_free(solv->brokenorphanrules); + solv->brokenorphanrules = solv_free(solv->brokenorphanrules); + } +} + +void +solver_check_brokenorphanrules(Solver *solv, Queue *dq) +{ + Pool *pool = solv->pool; + int i; + Id l, pp; + + queue_empty(dq); + if (!solv->brokenorphanrules) + return; + for (i = 0; i < solv->brokenorphanrules->count; i++) + { + int rid = solv->brokenorphanrules->elements[i]; + Rule *r = solv->rules + rid; + FOR_RULELITERALS(l, pp, r) + { + if (l < 0) + { + if (solv->decisionmap[-l] <= 0) + break; + } + else + { + if (solv->decisionmap[l] > 0 && pool->solvables[l].repo != solv->installed) + break; + } + } + if (l) + continue; + FOR_RULELITERALS(l, pp, r) + if (l > 0 && solv->decisionmap[l] == 0 && pool->solvables[l].repo != solv->installed) + queue_pushunique(dq, l); + } +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.0/src/rules.h new/libsolv-0.6.1/src/rules.h --- old/libsolv-0.6.0/src/rules.h 2013-10-14 17:26:33.000000000 +0200 +++ new/libsolv-0.6.1/src/rules.h 2014-04-17 14:20:44.000000000 +0200 @@ -142,6 +142,9 @@ extern Id solver_rule2solvable(struct _Solver *solv, Id rid); extern void solver_rule2rules(struct _Solver *solv, Id rid, Queue *q, int recursive); +/* orphan handling */ +extern void solver_breakorphans(struct _Solver *solv); +extern void solver_check_brokenorphanrules(struct _Solver *solv, Queue *dq); #ifdef __cplusplus } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.0/src/solver.c new/libsolv-0.6.1/src/solver.c --- old/libsolv-0.6.0/src/solver.c 2014-04-04 18:50:12.000000000 +0200 +++ new/libsolv-0.6.1/src/solver.c 2014-04-17 14:20:44.000000000 +0200 @@ -1573,6 +1573,7 @@ queuep_free(&solv->installsuppdepq); queuep_free(&solv->recommendscplxq); queuep_free(&solv->suggestscplxq); + queuep_free(&solv->brokenorphanrules); map_free(&solv->recommendsmap); map_free(&solv->suggestsmap); @@ -1639,6 +1640,10 @@ return solv->dup_allowarchchange; case SOLVER_FLAG_DUP_ALLOW_VENDORCHANGE: return solv->dup_allowvendorchange; + case SOLVER_FLAG_KEEP_ORPHANS: + return solv->keep_orphans; + case SOLVER_FLAG_BREAK_ORPHANS: + return solv->break_orphans; default: break; } @@ -1702,6 +1707,12 @@ case SOLVER_FLAG_DUP_ALLOW_VENDORCHANGE: solv->dup_allowvendorchange = value; break; + case SOLVER_FLAG_KEEP_ORPHANS: + solv->keep_orphans = value; + break; + case SOLVER_FLAG_BREAK_ORPHANS: + solv->break_orphans = value; + break; default: break; } @@ -2677,6 +2688,26 @@ break; continue; /* back to main loop */ } + if (solv->brokenorphanrules) + { + solver_check_brokenorphanrules(solv, &dq); + if (dq.count) + { + policy_filter_unwanted(solv, &dq, POLICY_MODE_CHOOSE); + for (i = 0; i < dq.count; i++) + { + p = dq.elements[i]; + POOL_DEBUG(SOLV_DEBUG_POLICY, "installing orphaned dep %s\n", pool_solvid2str(pool, p)); + olevel = level; + level = setpropagatelearn(solv, level, p, 0, 0); + if (level < olevel) + break; + } + if (level == 0) + break; + continue; + } + } } /* one final pass to make sure we decided all installed packages */ @@ -3293,6 +3324,7 @@ queuep_free(&solv->suggestscplxq); solv->recommends_index = 0; } + queuep_free(&solv->brokenorphanrules); solv->specialupdaters = solv_free(solv->specialupdaters); @@ -3574,20 +3606,16 @@ * check for and remove duplicate */ r = solv->rules + solv->nrules - 1; /* r: update rule */ + if (!r->p) + continue; sr = r - (installed->end - installed->start); /* sr: feature rule */ - /* it's orphaned if there is no feature rule or the feature rule - * consists just of the installed package */ - if (!sr->p || (sr->p == i && !sr->d && !sr->w2)) + /* it's also orphaned if the feature rule consists just of the installed package */ + if (!solv->dupmap_all && sr->p == i && !sr->d && !sr->w2) queue_push(&solv->orphaned, i); - if (!r->p) - { - /* assert(solv->dupmap_all && !sr->p); */ - continue; - } if (!solver_rulecmp(solv, r, sr)) memset(sr, 0, sizeof(*sr)); /* delete unneeded feature rule */ else - solver_disablerule(solv, sr); /* disable feature rule */ + solver_disablerule(solv, sr); /* disable feature rule for now */ } /* consistency check: we added a rule for _every_ installed solvable */ assert(solv->nrules - solv->updaterules == installed->end - installed->start); @@ -3874,6 +3902,10 @@ /* disable update rules that conflict with our job */ solver_disablepolicyrules(solv); + /* break orphans if requested */ + if (solv->dupmap_all && solv->orphaned.count && solv->break_orphans) + solver_breakorphans(solv); + /* make initial decisions based on assertion rules */ makeruledecisions(solv); POOL_DEBUG(SOLV_DEBUG_SOLVER, "problems so far: %d\n", solv->problems.count); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsolv-0.6.0/src/solver.h new/libsolv-0.6.1/src/solver.h --- old/libsolv-0.6.0/src/solver.h 2014-04-04 18:50:12.000000000 +0200 +++ new/libsolv-0.6.1/src/solver.h 2014-04-17 14:20:44.000000000 +0200 @@ -185,6 +185,9 @@ Queue addedmap_deduceq; /* deduce addedmap from rpm rules */ Id *instbuddy; /* buddies of installed packages */ + int keep_orphans; /* how to treat orphans */ + int break_orphans; /* how to treat orphans */ + Queue *brokenorphanrules; /* broken rules of orphaned packages */ #endif /* LIBSOLV_INTERNAL */ }; @@ -282,6 +285,8 @@ #define SOLVER_FLAG_DUP_ALLOW_ARCHCHANGE 15 #define SOLVER_FLAG_DUP_ALLOW_VENDORCHANGE 16 #define SOLVER_FLAG_DUP_ALLOW_NAMECHANGE 17 +#define SOLVER_FLAG_KEEP_ORPHANS 18 +#define SOLVER_FLAG_BREAK_ORPHANS 19 #define GET_USERINSTALLED_NAMES (1 << 0) /* package names instead if ids */ #define GET_USERINSTALLED_INVERTED (1 << 1) /* autoinstalled */ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-server for openSUSE:13.1:Update
by root＠hilbert.suse.de 25 Apr '14

25 Apr '14

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:13.1:Update checked in at 2014-04-25 10:07:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/xorg-x11-server (Old) and /work/SRC/openSUSE:13.1:Update/.xorg-x11-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11-server" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.MvdQ7g/_old 2014-04-25 10:07:31.000000000 +0200 +++ /var/tmp/diff_new_pack.MvdQ7g/_new 2014-04-25 10:07:31.000000000 +0200 @@ -1 +1 @@ -<link package='xorg-x11-server.2418' cicount='copy' /> +<link package='xorg-x11-server.2750' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-server for openSUSE:12.3:Update
by root＠hilbert.suse.de 25 Apr '14

25 Apr '14

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:12.3:Update checked in at 2014-04-25 10:07:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/xorg-x11-server (Old) and /work/SRC/openSUSE:12.3:Update/.xorg-x11-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11-server" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.wP47ww/_old 2014-04-25 10:07:29.000000000 +0200 +++ /var/tmp/diff_new_pack.wP47ww/_new 2014-04-25 10:07:29.000000000 +0200 @@ -1 +1 @@ -<link package='xorg-x11-server.2418' cicount='copy' /> +<link package='xorg-x11-server.2750' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python3-setuptools for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package python3-setuptools for openSUSE:Factory checked in at 2014-04-23 20:37:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-setuptools (Old) and /work/SRC/openSUSE:Factory/.python3-setuptools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-setuptools" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-setuptools/python3-setuptools.changes 2014-03-21 13:34:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-setuptools.new/python3-setuptools.changes 2014-04-23 20:37:25.000000000 +0200 @@ -1,0 +2,34 @@ +Thu Apr 17 11:57:05 UTC 2014 - toddrme2178(a)gmail.com + +- Update to version 3.4.4 + * Issue #184: Correct failure where find_package over-matched + packages when directory traversal isn't short-circuited. +- Update to version 3.4.3 + * Issue #183: Really fix test command with Python 3.1. +- Update to version 3.4.2 + * Issue #183: Fix additional regression in test command on + Python 3.1. +- Update to version 3.4.1 + * Issue #180: Fix regression in test command not caught + by py.test-run tests. +- Update to version 3.4 + * Issue #176: Add parameter to the test command to support a + custom test runner: --test-runner or -r. + * Issue #177: Now assume most common invocation to install + command on platforms/environments without stack support + (issuing a warning). Setuptools now installs naturally on + IronPython. Behavior on CPython should be unchanged. +- Remove %check, which now depends on pytest and thus introduces + a dependency loop (setuptools->pytest->py->setuptools) + +------------------------------------------------------------------- +Thu Mar 20 14:25:10 UTC 2014 - speilicke(a)suse.com + +- Update to version 3.3: + * Add ``include`` parameter to ``setuptools.find_packages()``. +- Changes from version 3.2: + * Pull Request #39: Add support for C++ targets from Cython ``.pyx`` files. + * Issue #162: Update dependency on certifi to 1.0.1. + * Issue #164: Update dependency on wincertstore to 0.2. + +------------------------------------------------------------------- Old: ---- setuptools-2.1.tar.gz New: ---- setuptools-3.4.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-setuptools.spec ++++++ --- /var/tmp/diff_new_pack.MbNx92/_old 2014-04-23 20:37:26.000000000 +0200 +++ /var/tmp/diff_new_pack.MbNx92/_new 2014-04-23 20:37:26.000000000 +0200 @@ -17,7 +17,7 @@ Name: python3-setuptools -Version: 2.1 +Version: 3.4.4 Release: 0 Url: http://pypi.python.org/pypi/setuptools Summary: Easily download, build, install, upgrade, and uninstall Python packages @@ -67,9 +67,6 @@ touch %{buildroot}%{_sysconfdir}/alternatives/easy_install ln -sf %{_sysconfdir}/alternatives/easy_install %{buildroot}/%{_bindir}/easy_install -%check -python3 setup.py test - %post update-alternatives \ --install %{_bindir}/easy_install easy_install %{_bindir}/easy_install-%{py3_ver} 30 @@ -86,10 +83,10 @@ %{_bindir}/easy_install-%{py3_ver} %ghost %{_sysconfdir}/alternatives/easy_install %{python3_sitelib}/_markerlib -%{python3_sitelib}/__pycache__ -%{python3_sitelib}/easy_install.py* -%{python3_sitelib}/pkg_resources.py* %{python3_sitelib}/setuptools %{python3_sitelib}/setuptools-%{version}-py%{py3_ver}.egg-info +%{python3_sitelib}/easy_install.py* +%{python3_sitelib}/pkg_resources.py* +%{python3_sitelib}/__pycache__ %changelog ++++++ setuptools-2.1.tar.gz -> setuptools-3.4.4.tar.gz ++++++ ++++ 4274 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python3-py for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '14

23 Apr '14

Hello community, here is the log from the commit of package python3-py for openSUSE:Factory checked in at 2014-04-23 20:37:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-py (Old) and /work/SRC/openSUSE:Factory/.python3-py.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-py" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-py/python3-py.changes 2014-01-07 16:26:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-py.new/python3-py.changes 2014-04-23 20:37:21.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Apr 23 13:47:10 UTC 2014 - toddrme2178(a)gmail.com + +- Update to version 1.4.20: + + ignore unicode decode errors in xmlescape. Thanks Anatoly Bubenkoff. + + on python2 modify traceback.format_exception_only to match python3 + behaviour, namely trying to print unicode for Exception instances + + use a safer way for serializing exception reports (helps to fix + pytest issue413) +- Drop %check section, we never ran tests. That would need python-pytest + and introduce a cycle + +------------------------------------------------------------------- Old: ---- py-1.4.19.tar.gz New: ---- py-1.4.20.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-py.spec ++++++ --- /var/tmp/diff_new_pack.ytsVra/_old 2014-04-23 20:37:22.000000000 +0200 +++ /var/tmp/diff_new_pack.ytsVra/_new 2014-04-23 20:37:22.000000000 +0200 @@ -17,7 +17,7 @@ Name: python3-py -Version: 1.4.19 +Version: 1.4.20 Release: 0 Summary: Library with cross-python path, ini-parsing, io, code, log facilities License: MIT @@ -53,9 +53,6 @@ %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} -%check -python3 setup.py test - %files %defattr(-,root,root,-) %doc LICENSE README.txt doc/_build/html ++++++ py-1.4.19.tar.gz -> py-1.4.20.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.19/CHANGELOG new/py-1.4.20/CHANGELOG --- old/py-1.4.19/CHANGELOG 2013-12-12 12:07:15.000000000 +0100 +++ new/py-1.4.20/CHANGELOG 2014-01-29 13:16:52.000000000 +0100 @@ -1,3 +1,14 @@ +1.4.20 +================================================== + +- ignore unicode decode errors in xmlescape. Thanks Anatoly Bubenkoff. + +- on python2 modify traceback.format_exception_only to match python3 + behaviour, namely trying to print unicode for Exception instances + +- use a safer way for serializing exception reports (helps to fix + pytest issue413) + Changes between 1.4.18 and 1.4.19 ================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.19/MANIFEST.in new/py-1.4.20/MANIFEST.in --- old/py-1.4.19/MANIFEST.in 2013-12-12 12:07:15.000000000 +0100 +++ new/py-1.4.20/MANIFEST.in 2014-01-29 13:16:52.000000000 +0100 @@ -1,7 +1,6 @@ include CHANGELOG include README.txt include setup.py -include distribute_setup.py include LICENSE include conftest.py include tox.ini diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.19/PKG-INFO new/py-1.4.20/PKG-INFO --- old/py-1.4.19/PKG-INFO 2013-12-12 12:07:15.000000000 +0100 +++ new/py-1.4.20/PKG-INFO 2014-01-29 13:16:53.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: py -Version: 1.4.19 +Version: 1.4.20 Summary: library with cross-python path, ini-parsing, io, code, log facilities Home-page: http://pylib.readthedocs.org/ Author: holger krekel, Ronny Pfannschmidt, Benjamin Peterson and others diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.19/doc/code.txt new/py-1.4.20/doc/code.txt --- old/py-1.4.19/doc/code.txt 2013-12-12 12:07:15.000000000 +0100 +++ new/py-1.4.20/doc/code.txt 2014-01-29 13:16:52.000000000 +0100 @@ -145,3 +145,6 @@ .. autoclass:: py.code.ExceptionInfo :members: +.. autoclass:: py.code.Traceback + :members: + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.19/py/__init__.py new/py-1.4.20/py/__init__.py --- old/py-1.4.19/py/__init__.py 2013-12-12 12:07:15.000000000 +0100 +++ new/py-1.4.20/py/__init__.py 2014-01-29 13:16:52.000000000 +0100 @@ -8,7 +8,7 @@ (c) Holger Krekel and others, 2004-2013 """ -__version__ = '1.4.19' +__version__ = '1.4.20' from py import _apipkg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.19/py/_code/_py2traceback.py new/py-1.4.20/py/_code/_py2traceback.py --- old/py-1.4.19/py/_code/_py2traceback.py 1970-01-01 01:00:00.000000000 +0100 +++ new/py-1.4.20/py/_code/_py2traceback.py 2014-01-29 13:16:52.000000000 +0100 @@ -0,0 +1,79 @@ +# copied from python-2.7.3's traceback.py +# CHANGES: +# - some_str is replaced, trying to create unicode strings +# +import types + +def format_exception_only(etype, value): + """Format the exception part of a traceback. + + The arguments are the exception type and value such as given by + sys.last_type and sys.last_value. The return value is a list of + strings, each ending in a newline. + + Normally, the list contains a single string; however, for + SyntaxError exceptions, it contains several lines that (when + printed) display detailed information about where the syntax + error occurred. + + The message indicating which exception occurred is always the last + string in the list. + + """ + + # An instance should not have a meaningful value parameter, but + # sometimes does, particularly for string exceptions, such as + # >>> raise string1, string2 # deprecated + # + # Clear these out first because issubtype(string1, SyntaxError) + # would throw another exception and mask the original problem. + if (isinstance(etype, BaseException) or + isinstance(etype, types.InstanceType) or + etype is None or type(etype) is str): + return [_format_final_exc_line(etype, value)] + + stype = etype.__name__ + + if not issubclass(etype, SyntaxError): + return [_format_final_exc_line(stype, value)] + + # It was a syntax error; show exactly where the problem was found. + lines = [] + try: + msg, (filename, lineno, offset, badline) = value.args + except Exception: + pass + else: + filename = filename or "<string>" + lines.append(' File "%s", line %d\n' % (filename, lineno)) + if badline is not None: + lines.append(' %s\n' % badline.strip()) + if offset is not None: + caretspace = badline.rstrip('\n')[:offset].lstrip() + # non-space whitespace (likes tabs) must be kept for alignment + caretspace = ((c.isspace() and c or ' ') for c in caretspace) + # only three spaces to account for offset1 == pos 0 + lines.append(' %s^\n' % ''.join(caretspace)) + value = msg + + lines.append(_format_final_exc_line(stype, value)) + return lines + +def _format_final_exc_line(etype, value): + """Return a list of a single line -- normal case for format_exception_only""" + valuestr = _some_str(value) + if value is None or not valuestr: + line = "%s\n" % etype + else: + line = "%s: %s\n" % (etype, valuestr) + return line + +def _some_str(value): + try: + return unicode(value) + except Exception: + try: + return str(value) + except Exception: + pass + return '<unprintable %s object>' % type(value).__name__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.19/py/_code/code.py new/py-1.4.20/py/_code/code.py --- old/py-1.4.19/py/_code/code.py 2013-12-12 12:07:15.000000000 +0100 +++ new/py-1.4.20/py/_code/code.py 2014-01-29 13:16:52.000000000 +0100 @@ -6,6 +6,11 @@ reprlib = py.builtin._tryimport('repr', 'reprlib') +if sys.version_info[0] >= 3: + from traceback import format_exception_only +else: + from py._code._py2traceback import format_exception_only + class Code(object): """ wrapper around Python code objects """ def __init__(self, rawcode): @@ -331,8 +336,6 @@ """ _striptext = '' def __init__(self, tup=None, exprinfo=None): - # NB. all attributes are private! Subclasses or other - # ExceptionInfo-like classes may have different attributes. if tup is None: tup = sys.exc_info() if exprinfo is None and isinstance(tup[1], AssertionError): @@ -342,9 +345,16 @@ if exprinfo and exprinfo.startswith('assert '): self._striptext = 'AssertionError: ' self._excinfo = tup - self.type, self.value, tb = tup + #: the exception class + self.type = tup[0] + #: the exception instance + self.value = tup[1] + #: the exception raw traceback + self.tb = tup[2] + #: the exception type name self.typename = self.type.__name__ - self.traceback = py.code.Traceback(tb) + #: the exception traceback (py.code.Traceback instance) + self.traceback = py.code.Traceback(self.tb) def __repr__(self): return "<ExceptionInfo %s tblen=%d>" % (self.typename, len(self.traceback)) @@ -357,7 +367,7 @@ the exception representation is returned (so 'AssertionError: ' is removed from the beginning) """ - lines = self._format_exception_only(self.type, self.value) + lines = format_exception_only(self.type, self.value) text = ''.join(lines) text = text.rstrip() if tryshort: @@ -365,17 +375,6 @@ text = text[len(self._striptext):] return text - def _format_exception_only(self, etype, value): - """Format the exception part of a traceback - - Since traceback.format_exception_only() destroys unicode on - python 2 we handle plain AsssertionErrors separately here. - """ - if isinstance(value, AssertionError) and hasattr(value, 'msg'): - return ['AssertionError: ' + value.msg] - else: - return py.std.traceback.format_exception_only(etype, value) - def errisinstance(self, exc): """ return True if the exception is an instance of exc """ return isinstance(self.value, exc) @@ -594,22 +593,16 @@ return s def __unicode__(self): - l = [] - tw = py.io.TerminalWriter(l.append) + # FYI this is called from pytest-xdist's serialization of exception + # information. + io = py.io.TextIO() + tw = py.io.TerminalWriter(file=io) self.toterminal(tw) - l = map(unicode_or_repr, l) - return "".join(l).strip() + return io.getvalue().strip() def __repr__(self): return "<%s instance at %0x>" %(self.__class__, id(self)) -def unicode_or_repr(obj): - try: - return py.builtin._totext(obj) - except KeyboardInterrupt: - raise - except Exception: - return "<print-error: %r>" % py.io.saferepr(obj) class ReprExceptionInfo(TerminalRepr): def __init__(self, reprtraceback, reprcrash): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.19/py/_io/capture.py new/py-1.4.20/py/_io/capture.py --- old/py-1.4.19/py/_io/capture.py 2013-12-12 12:07:15.000000000 +0100 +++ new/py-1.4.20/py/_io/capture.py 2014-01-29 13:16:52.000000000 +0100 @@ -183,7 +183,14 @@ """ def __init__(self, out=True, err=True, mixed=False, in_=True, patchsys=True, now=True): - self._options = locals() + self._options = { + "out": out, + "err": err, + "mixed": mixed, + "in_": in_, + "patchsys": patchsys, + "now": now, + } self._save() if now: self.startall() @@ -251,20 +258,26 @@ def readouterr(self): """ return snapshot value of stdout/stderr capturings. """ - l = [] - for name in ('out', 'err'): - res = "" - if hasattr(self, name): - f = getattr(self, name).tmpfile - f.seek(0) - res = f.read() - enc = getattr(f, 'encoding', None) - if enc: - res = py.builtin._totext(res, enc, 'replace') - f.truncate(0) - f.seek(0) - l.append(res) - return l + if hasattr(self, "out"): + out = self._readsnapshot(self.out.tmpfile) + else: + out = "" + if hasattr(self, "err"): + err = self._readsnapshot(self.err.tmpfile) + else: + err = "" + return [out, err] + + def _readsnapshot(self, f): + f.seek(0) + res = f.read() + enc = getattr(f, "encoding", None) + if enc: + res = py.builtin._totext(res, enc, "replace") + f.truncate(0) + f.seek(0) + return res + class StdCapture(Capture): """ This class allows to capture writes to sys.stdout|stderr "in-memory" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.19/py/_xmlgen.py new/py-1.4.20/py/_xmlgen.py --- old/py-1.4.19/py/_xmlgen.py 2013-12-12 12:07:15.000000000 +0100 +++ new/py-1.4.20/py/_xmlgen.py 2014-01-29 13:16:52.000000000 +0100 @@ -9,7 +9,7 @@ if sys.version_info >= (3,0): def u(s): return s - def unicode(x): + def unicode(x, errors=None): if hasattr(x, '__unicode__'): return x.__unicode__() return str(x) @@ -244,7 +244,10 @@ def __call__(self, ustring): """ xml-escape the given unicode string. """ - ustring = unicode(ustring) + try: + ustring = unicode(ustring) + except UnicodeDecodeError: + ustring = unicode(ustring, 'utf-8', errors='replace') return self.charef_rex.sub(self._replacer, ustring) escape = _escape() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.19/py.egg-info/PKG-INFO new/py-1.4.20/py.egg-info/PKG-INFO --- old/py-1.4.19/py.egg-info/PKG-INFO 2013-12-12 12:07:15.000000000 +0100 +++ new/py-1.4.20/py.egg-info/PKG-INFO 2014-01-29 13:16:53.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: py -Version: 1.4.19 +Version: 1.4.20 Summary: library with cross-python path, ini-parsing, io, code, log facilities Home-page: http://pylib.readthedocs.org/ Author: holger krekel, Ronny Pfannschmidt, Benjamin Peterson and others diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.19/py.egg-info/SOURCES.txt new/py-1.4.20/py.egg-info/SOURCES.txt --- old/py-1.4.19/py.egg-info/SOURCES.txt 2013-12-12 12:07:15.000000000 +0100 +++ new/py-1.4.20/py.egg-info/SOURCES.txt 2014-01-29 13:16:53.000000000 +0100 @@ -59,6 +59,7 @@ py/_code/__init__.py py/_code/_assertionnew.py py/_code/_assertionold.py +py/_code/_py2traceback.py py/_code/assertion.py py/_code/code.py py/_code/source.py @@ -86,7 +87,6 @@ testing/code/test_excinfo.py testing/code/test_source.py testing/io_/__init__.py -testing/io_/test_capture.py testing/io_/test_saferepr.py testing/io_/test_terminalwriter.py testing/log/__init__.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.19/setup.py new/py-1.4.20/setup.py --- old/py-1.4.19/setup.py 2013-12-12 12:07:15.000000000 +0100 +++ new/py-1.4.20/setup.py 2014-01-29 13:16:52.000000000 +0100 @@ -7,7 +7,7 @@ name='py', description='library with cross-python path, ini-parsing, io, code, log facilities', long_description = open('README.txt').read(), - version='1.4.19', + version='1.4.20', url='http://pylib.readthedocs.org/', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.19/testing/code/test_code.py new/py-1.4.20/testing/code/test_code.py --- old/py-1.4.19/testing/code/test_code.py 2013-12-12 12:07:15.000000000 +0100 +++ new/py-1.4.20/testing/code/test_code.py 2014-01-29 13:16:52.000000000 +0100 @@ -89,23 +89,6 @@ if sys.version_info[0] < 3: u = unicode(excinfo) -def test_unicode_or_repr(): - from py._code.code import unicode_or_repr - assert unicode_or_repr('hello') == "hello" - if sys.version_info[0] < 3: - s = unicode_or_repr('\xf6\xc4\x85') - else: - s = eval("unicode_or_repr(b'\\f6\\xc4\\x85')") - assert 'print-error' in s - assert 'c4' in s - class A: - def __repr__(self): - raise ValueError() - s = unicode_or_repr(A()) - assert 'print-error' in s - assert 'ValueError' in s - - def test_code_getargs(): def f1(x): pass diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.19/testing/code/test_excinfo.py new/py-1.4.20/testing/code/test_excinfo.py --- old/py-1.4.19/testing/code/test_excinfo.py 2013-12-12 12:07:15.000000000 +0100 +++ new/py-1.4.20/testing/code/test_excinfo.py 2014-01-29 13:16:52.000000000 +0100 @@ -727,6 +727,14 @@ assert isinstance(repr, ReprExceptionInfo) assert repr.reprtraceback.style == style + def test_reprexcinfo_unicode(self): + from py._code.code import TerminalRepr + class MyRepr(TerminalRepr): + def toterminal(self, tw): + tw.line(py.builtin._totext("я", "utf-8")) + x = py.builtin._totext(MyRepr()) + assert x == py.builtin._totext("я", "utf-8") + def test_toterminal_long(self, importasmod): mod = importasmod(""" def g(x): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.19/testing/io_/test_capture.py new/py-1.4.20/testing/io_/test_capture.py --- old/py-1.4.19/testing/io_/test_capture.py 2013-12-12 12:07:15.000000000 +0100 +++ new/py-1.4.20/testing/io_/test_capture.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,501 +0,0 @@ -from __future__ import with_statement - -import os, sys -import py - -needsdup = py.test.mark.skipif("not hasattr(os, 'dup')") - -from py.builtin import print_ - -if sys.version_info >= (3,0): - def tobytes(obj): - if isinstance(obj, str): - obj = obj.encode('UTF-8') - assert isinstance(obj, bytes) - return obj - def totext(obj): - if isinstance(obj, bytes): - obj = str(obj, 'UTF-8') - assert isinstance(obj, str) - return obj -else: - def tobytes(obj): - if isinstance(obj, unicode): - obj = obj.encode('UTF-8') - assert isinstance(obj, str) - return obj - def totext(obj): - if isinstance(obj, str): - obj = unicode(obj, 'UTF-8') - assert isinstance(obj, unicode) - return obj - -def oswritebytes(fd, obj): - os.write(fd, tobytes(obj)) - -class TestTextIO: - def test_text(self): - f = py.io.TextIO() - f.write("hello") - s = f.getvalue() - assert s == "hello" - f.close() - - def test_unicode_and_str_mixture(self): - f = py.io.TextIO() - if sys.version_info >= (3,0): - f.write("\u00f6") - py.test.raises(TypeError, "f.write(bytes('hello', 'UTF-8'))") - else: - f.write(unicode("\u00f6", 'UTF-8')) - f.write("hello") # bytes - s = f.getvalue() - f.close() - assert isinstance(s, unicode) - -def test_bytes_io(): - f = py.io.BytesIO() - f.write(tobytes("hello")) - py.test.raises(TypeError, "f.write(totext('hello'))") - s = f.getvalue() - assert s == tobytes("hello") - -def test_dontreadfrominput(): - from py._io.capture import DontReadFromInput - f = DontReadFromInput() - assert not f.isatty() - py.test.raises(IOError, f.read) - py.test.raises(IOError, f.readlines) - py.test.raises(IOError, iter, f) - py.test.raises(ValueError, f.fileno) - f.close() # just for completeness - -def pytest_funcarg__tmpfile(request): - testdir = request.getfuncargvalue("testdir") - f = testdir.makepyfile("").open('wb+') - request.addfinalizer(f.close) - return f - -@needsdup -def test_dupfile(tmpfile): - flist = [] - for i in range(5): - nf = py.io.dupfile(tmpfile, encoding="utf-8") - assert nf != tmpfile - assert nf.fileno() != tmpfile.fileno() - assert nf not in flist - print_(i, end="", file=nf) - flist.append(nf) - for i in range(5): - f = flist[i] - f.close() - tmpfile.seek(0) - s = tmpfile.read() - assert "01234" in repr(s) - tmpfile.close() - -def test_dupfile_no_mode(): - """ - dupfile should trap an AttributeError and return f if no mode is supplied. - """ - class SomeFileWrapper(object): - "An object with a fileno method but no mode attribute" - def fileno(self): - return 1 - tmpfile = SomeFileWrapper() - assert py.io.dupfile(tmpfile) is tmpfile - with py.test.raises(AttributeError): - py.io.dupfile(tmpfile, raising=True) - -def lsof_check(func): - pid = os.getpid() - try: - out = py.process.cmdexec("lsof -p %d" % pid) - except py.process.cmdexec.Error: - py.test.skip("could not run 'lsof'") - func() - out2 = py.process.cmdexec("lsof -p %d" % pid) - len1 = len([x for x in out.split("\n") if "REG" in x]) - len2 = len([x for x in out2.split("\n") if "REG" in x]) - assert len2 < len1 + 3, out2 - -class TestFDCapture: - pytestmark = needsdup - - def test_not_now(self, tmpfile): - fd = tmpfile.fileno() - cap = py.io.FDCapture(fd, now=False) - data = tobytes("hello") - os.write(fd, data) - f = cap.done() - s = f.read() - assert not s - cap = py.io.FDCapture(fd, now=False) - cap.start() - os.write(fd, data) - f = cap.done() - s = f.read() - assert s == "hello" - - def test_simple(self, tmpfile): - fd = tmpfile.fileno() - cap = py.io.FDCapture(fd) - data = tobytes("hello") - os.write(fd, data) - f = cap.done() - s = f.read() - assert s == "hello" - f.close() - - def test_simple_many(self, tmpfile): - for i in range(10): - self.test_simple(tmpfile) - - def test_simple_many_check_open_files(self, tmpfile): - lsof_check(lambda: self.test_simple_many(tmpfile)) - - def test_simple_fail_second_start(self, tmpfile): - fd = tmpfile.fileno() - cap = py.io.FDCapture(fd) - f = cap.done() - py.test.raises(ValueError, cap.start) - f.close() - - def test_stderr(self): - cap = py.io.FDCapture(2, patchsys=True) - print_("hello", file=sys.stderr) - f = cap.done() - s = f.read() - assert s == "hello\n" - - def test_stdin(self, tmpfile): - tmpfile.write(tobytes("3")) - tmpfile.seek(0) - cap = py.io.FDCapture(0, tmpfile=tmpfile) - # check with os.read() directly instead of raw_input(), because - # sys.stdin itself may be redirected (as py.test now does by default) - x = os.read(0, 100).strip() - f = cap.done() - assert x == tobytes("3") - - def test_writeorg(self, tmpfile): - data1, data2 = tobytes("foo"), tobytes("bar") - try: - cap = py.io.FDCapture(tmpfile.fileno()) - tmpfile.write(data1) - cap.writeorg(data2) - finally: - tmpfile.close() - f = cap.done() - scap = f.read() - assert scap == totext(data1) - stmp = open(tmpfile.name, 'rb').read() - assert stmp == data2 - - -class TestStdCapture: - def getcapture(self, **kw): - return py.io.StdCapture(**kw) - - def test_capturing_done_simple(self): - cap = self.getcapture() - sys.stdout.write("hello") - sys.stderr.write("world") - outfile, errfile = cap.done() - s = outfile.read() - assert s == "hello" - s = errfile.read() - assert s == "world" - - def test_capturing_reset_simple(self): - cap = self.getcapture() - print("hello world") - sys.stderr.write("hello error\n") - out, err = cap.reset() - assert out == "hello world\n" - assert err == "hello error\n" - - def test_capturing_readouterr(self): - cap = self.getcapture() - try: - print ("hello world") - sys.stderr.write("hello error\n") - out, err = cap.readouterr() - assert out == "hello world\n" - assert err == "hello error\n" - sys.stderr.write("error2") - finally: - out, err = cap.reset() - assert err == "error2" - - def test_capturing_readouterr_unicode(self): - cap = self.getcapture() - print ("hx\xc4\x85\xc4\x87") - out, err = cap.readouterr() - assert out == py.builtin._totext("hx\xc4\x85\xc4\x87\n", "utf8") - - @py.test.mark.skipif('sys.version_info >= (3,)', - reason='text output different for bytes on python3') - def test_capturing_readouterr_decode_error_handling(self): - cap = self.getcapture() - # triggered a internal error in pytest - print('\xa6') - out, err = cap.readouterr() - assert out == py.builtin._totext('\ufffd\n', 'unicode-escape') - - def test_capturing_mixed(self): - cap = self.getcapture(mixed=True) - sys.stdout.write("hello ") - sys.stderr.write("world") - sys.stdout.write(".") - out, err = cap.reset() - assert out.strip() == "hello world." - assert not err - - def test_reset_twice_error(self): - cap = self.getcapture() - print ("hello") - out, err = cap.reset() - py.test.raises(ValueError, cap.reset) - assert out == "hello\n" - assert not err - - def test_capturing_modify_sysouterr_in_between(self): - oldout = sys.stdout - olderr = sys.stderr - cap = self.getcapture() - sys.stdout.write("hello") - sys.stderr.write("world") - sys.stdout = py.io.TextIO() - sys.stderr = py.io.TextIO() - print ("not seen") - sys.stderr.write("not seen\n") - out, err = cap.reset() - assert out == "hello" - assert err == "world" - assert sys.stdout == oldout - assert sys.stderr == olderr - - def test_capturing_error_recursive(self): - cap1 = self.getcapture() - print ("cap1") - cap2 = self.getcapture() - print ("cap2") - out2, err2 = cap2.reset() - out1, err1 = cap1.reset() - assert out1 == "cap1\n" - assert out2 == "cap2\n" - - def test_just_out_capture(self): - cap = self.getcapture(out=True, err=False) - sys.stdout.write("hello") - sys.stderr.write("world") - out, err = cap.reset() - assert out == "hello" - assert not err - - def test_just_err_capture(self): - cap = self.getcapture(out=False, err=True) - sys.stdout.write("hello") - sys.stderr.write("world") - out, err = cap.reset() - assert err == "world" - assert not out - - def test_stdin_restored(self): - old = sys.stdin - cap = self.getcapture(in_=True) - newstdin = sys.stdin - out, err = cap.reset() - assert newstdin != sys.stdin - assert sys.stdin is old - - def test_stdin_nulled_by_default(self): - print ("XXX this test may well hang instead of crashing") - print ("XXX which indicates an error in the underlying capturing") - print ("XXX mechanisms") - cap = self.getcapture() - py.test.raises(IOError, "sys.stdin.read()") - out, err = cap.reset() - - def test_suspend_resume(self): - cap = self.getcapture(out=True, err=False, in_=False) - try: - print ("hello") - sys.stderr.write("error\n") - out, err = cap.suspend() - assert out == "hello\n" - assert not err - print ("in between") - sys.stderr.write("in between\n") - cap.resume() - print ("after") - sys.stderr.write("error_after\n") - finally: - out, err = cap.reset() - assert out == "after\n" - assert not err - -class TestStdCaptureNotNow(TestStdCapture): - def getcapture(self, **kw): - kw['now'] = False - cap = py.io.StdCapture(**kw) - cap.startall() - return cap - -class TestStdCaptureFD(TestStdCapture): - pytestmark = needsdup - - def getcapture(self, **kw): - return py.io.StdCaptureFD(**kw) - - def test_intermingling(self): - cap = self.getcapture() - oswritebytes(1, "1") - sys.stdout.write(str(2)) - sys.stdout.flush() - oswritebytes(1, "3") - oswritebytes(2, "a") - sys.stderr.write("b") - sys.stderr.flush() - oswritebytes(2, "c") - out, err = cap.reset() - assert out == "123" - assert err == "abc" - - def test_callcapture(self): - def func(x, y): - print (x) - py.std.sys.stderr.write(str(y)) - return 42 - - res, out, err = py.io.StdCaptureFD.call(func, 3, y=4) - assert res == 42 - assert out.startswith("3") - assert err.startswith("4") - - def test_many(self, capfd): - def f(): - for i in range(10): - cap = py.io.StdCaptureFD() - cap.reset() - lsof_check(f) - -class TestStdCaptureFDNotNow(TestStdCaptureFD): - pytestmark = needsdup - - def getcapture(self, **kw): - kw['now'] = False - cap = py.io.StdCaptureFD(**kw) - cap.startall() - return cap - -@needsdup -def test_stdcapture_fd_tmpfile(tmpfile): - capfd = py.io.StdCaptureFD(out=tmpfile) - os.write(1, "hello".encode("ascii")) - os.write(2, "world".encode("ascii")) - outf, errf = capfd.done() - assert outf == tmpfile - -class TestStdCaptureFDinvalidFD: - pytestmark = needsdup - def test_stdcapture_fd_invalid_fd(self, testdir): - testdir.makepyfile(""" - import py, os - def test_stdout(): - os.close(1) - cap = py.io.StdCaptureFD(out=True, err=False, in_=False) - cap.done() - def test_stderr(): - os.close(2) - cap = py.io.StdCaptureFD(out=False, err=True, in_=False) - cap.done() - def test_stdin(): - os.close(0) - cap = py.io.StdCaptureFD(out=False, err=False, in_=True) - cap.done() - """) - result = testdir.runpytest("--capture=fd") - assert result.ret == 0 - assert result.parseoutcomes()['passed'] == 3 - -def test_capture_not_started_but_reset(): - capsys = py.io.StdCapture(now=False) - capsys.done() - capsys.done() - capsys.reset() - -@needsdup -def test_capture_no_sys(): - capsys = py.io.StdCapture() - try: - cap = py.io.StdCaptureFD(patchsys=False) - sys.stdout.write("hello") - sys.stderr.write("world") - oswritebytes(1, "1") - oswritebytes(2, "2") - out, err = cap.reset() - assert out == "1" - assert err == "2" - finally: - capsys.reset() - -@needsdup -def test_callcapture_nofd(): - def func(x, y): - oswritebytes(1, "hello") - oswritebytes(2, "hello") - print (x) - sys.stderr.write(str(y)) - return 42 - - capfd = py.io.StdCaptureFD(patchsys=False) - try: - res, out, err = py.io.StdCapture.call(func, 3, y=4) - finally: - capfd.reset() - assert res == 42 - assert out.startswith("3") - assert err.startswith("4") - -@needsdup -(a)py.test.mark.multi(use=[True, False]) -def test_fdcapture_tmpfile_remains_the_same(tmpfile, use): - if not use: - tmpfile = True - cap = py.io.StdCaptureFD(out=False, err=tmpfile, now=False) - cap.startall() - capfile = cap.err.tmpfile - cap.suspend() - cap.resume() - capfile2 = cap.err.tmpfile - assert capfile2 == capfile - -(a)py.test.mark.multi(method=['StdCapture', 'StdCaptureFD']) -def test_capturing_and_logging_fundamentals(testdir, method): - if method == "StdCaptureFD" and not hasattr(os, 'dup'): - py.test.skip("need os.dup") - # here we check a fundamental feature - p = testdir.makepyfile(""" - import sys, os - import py, logging - cap = py.io.%s(out=False, in_=False) - - logging.warn("hello1") - outerr = cap.suspend() - print ("suspend, captured %%s" %%(outerr,)) - logging.warn("hello2") - - cap.resume() - logging.warn("hello3") - - outerr = cap.suspend() - print ("suspend2, captured %%s" %% (outerr,)) - """ % (method,)) - result = testdir.runpython(p) - result.stdout.fnmatch_lines([ - "suspend, captured*hello1*", - "suspend2, captured*hello2*WARNING:root:hello3*", - ]) - assert "atexit" not in result.stderr.str() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.19/testing/io_/test_saferepr.py new/py-1.4.20/testing/io_/test_saferepr.py --- old/py-1.4.19/testing/io_/test_saferepr.py 2013-12-12 12:07:15.000000000 +0100 +++ new/py-1.4.20/testing/io_/test_saferepr.py 2014-01-29 13:16:52.000000000 +0100 @@ -76,18 +76,3 @@ if sys.version_info[0] < 3: u = unicode(excinfo) -def test_unicode_or_repr(): - from py._code.code import unicode_or_repr - assert unicode_or_repr('hello') == "hello" - if sys.version_info[0] < 3: - s = unicode_or_repr('\xf6\xc4\x85') - else: - s = eval("unicode_or_repr(b'\\f6\\xc4\\x85')") - assert 'print-error' in s - assert 'c4' in s - class A: - def __repr__(self): - raise ValueError() - s = unicode_or_repr(A()) - assert 'print-error' in s - assert 'ValueError' in s diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.19/testing/root/test_xmlgen.py new/py-1.4.20/testing/root/test_xmlgen.py --- old/py-1.4.19/testing/root/test_xmlgen.py 2013-12-12 12:07:15.000000000 +0100 +++ new/py-1.4.20/testing/root/test_xmlgen.py 2014-01-29 13:16:52.000000000 +0100 @@ -6,7 +6,7 @@ pass def test_escape(): - uvalue = py.builtin._totext('\xc4\x85\xc4\x87\n', 'utf-8') + uvalue = py.builtin._totext('\xc4\x85\xc4\x87\n\xe2\x82\xac\n', 'utf-8') class A: def __unicode__(self): return uvalue @@ -22,6 +22,8 @@ if py.std.sys.version_info[0] < 3: assert isinstance(x, unicode) assert isinstance(y, unicode) + y = py.xml.escape(uvalue.encode('utf-8')) + assert y == uvalue def test_tag_with_text(): -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0