Reversed patch detected.... Hum, that patch has been removed in the upgrade to python 2.7.7 in http://git.sagemath.org/sage.git/commit/?id=cb92c74c33041d9a93c61823ccfd92aea3eb6a7f So it looks git just didn't remove it from your branch or something more funky happened.
François On 12/08/2014, at 21:17, Jeroen Demeyer <[email protected]> wrote: > After upgrading a Sage 6.2 installation to Sage 6.3, a Python patch fails to > apply. Since nobody else reported this problem, I will investigate what > happened: > > > /opt/sage/sage-6.1.1/build/pipestatus "sage-spkg ${SAGE_SPKG_OPTS} > python-2.7.8 2>&1" "tee -a /opt/sage/sage-6.1.1/logs/pkgs/python-2.7.8.log" > Found local metadata for python-2.7.8 > Found local sources at /opt/sage/sage-6.1.1/upstream/python-2.7.8.tar.gz > Checksum: 511960dd78451a06c9df76509635aeec05b2051a vs > 511960dd78451a06c9df76509635aeec05b2051a > python-2.7.8 > ==================================================== > Setting up build directory for python-2.7.8 > Finished set up > **************************************************** > Host system: > Linux sage4 3.2.1-gentoo-r2 #15 SMP Tue May 15 10:40:50 CEST 2012 x86_64 > Intel(R) Xeon(R) CPU X5660 @ 2.80GHz GenuineIntel GNU/Linux > **************************************************** > C compiler: gcc > C compiler version: > Using built-in specs. > COLLECT_GCC=/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.3/gcc > COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-pc-linux-gnu/4.7.3/lto-wrapper > Target: x86_64-pc-linux-gnu > Configured with: > /var/tmp/portage/sys-devel/gcc-4.7.3-r1/work/gcc-4.7.3/configure > --prefix=/usr --bindir=/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.3 > --includedir=/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.3/include > --datadir=/usr/share/gcc-data/x86_64-pc-linux-gnu/4.7.3 > --mandir=/usr/share/gcc-data/x86_64-pc-linux-gnu/4.7.3/man > --infodir=/usr/share/gcc-data/x86_64-pc-linux-gnu/4.7.3/info > --with-gxx-include-dir=/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.3/include/g++-v4 > --host=x86_64-pc-linux-gnu --build=x86_64-pc-linux-gnu --disable-altivec > --disable-fixed-point --without-cloog --without-ppl --disable-lto > --enable-nls --without-included-gettext --with-system-zlib --enable-obsolete > --disable-werror --enable-secureplt --enable-multilib > --with-multilib-list=m32,m64 --enable-libmudflap --disable-libssp > --enable-libgomp > --with-python-dir=/share/gcc-data/x86_64-pc-linux-gnu/4.7.3/python > --enable-checking=release --disable-libgcj --enable-libstdcxx-time > --enable-languages=c,c++,fortran --enable-shared --enable-threads=posix > --enable-__cxa_atexit --enable-clocale=gnu --enable-targets=all > --with-bugurl=http://bugs.gentoo.org/ --with-pkgversion='Gentoo 4.7.3-r1 > p1.3, pie-0.5.5' > Thread model: posix > gcc version 4.7.3 (Gentoo 4.7.3-r1 p1.3, pie-0.5.5) > **************************************************** > patching file Modules/_ctypes/libffi/src/x86/ffi.c > patching file Modules/_ctypes/libffi/src/x86/win64.S > patching file Modules/_ctypes/libffi/fficonfig.py.in > Hunk #1 succeeded at 22 (offset -1 lines). > patching file Python/pythonrun.c > patching file Lib/test/test_hashlib.py > Hunk #1 succeeded at 21 (offset 2 lines). > Hunk #2 succeeded at 37 (offset 2 lines). > patching file setup.py > Hunk #2 succeeded at 849 (offset 4 lines). > patching file setup.py > Reversed (or previously applied) patch detected! Assume -R? [n] > Apply anyway? [n] > Skipping patch. > 1 out of 1 hunk ignored -- saving rejects to file setup.py.rej > Error: Patch "../patches/inc_lib_dirs-issue_17990.patch" failed to apply. > > -- > You received this message because you are subscribed to the Google Groups > "sage-devel" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > To post to this group, send email to [email protected]. > Visit this group at http://groups.google.com/group/sage-devel. > For more options, visit https://groups.google.com/d/optout. This email may be confidential and subject to legal privilege, it may not reflect the views of the University of Canterbury, and it is not guaranteed to be virus free. If you are not an intended recipient, please notify the sender immediately and erase all copies of the message and any attachments. Please refer to http://www.canterbury.ac.nz/emaildisclaimer for more information. -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
