Bug 147242
| Summary: | ports-mgmt/portupgrade incorrectly remove old port when new one fails to compile | ||
|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Ollivier Robert <roberto> |
| Component: | Individual Port(s) | Assignee: | freebsd-ports-bugs (Nobody) <ports-bugs> |
| Status: | Closed FIXED | ||
| Severity: | Affects Only Me | ||
| Priority: | Normal | ||
| Version: | Latest | ||
| Hardware: | Any | ||
| OS: | Any | ||
|
Description
Ollivier Robert
2010-05-31 11:30:05 UTC
Responsible Changed From-To: freebsd-ports-bugs->ruby Over to maintainer(s). Responsible Changed From-To: ruby->pgollucci I will take it Responsible Changed From-To: pgollucci->freebsd-ports-bugs going to have enotime for the next 2 weeks, sorry Responsible Changed From-To: freebsd-ports-bugs->ruby over to maintainer(s) Responsible Changed From-To: ruby->swills I'll take it. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I created a test case by adding a busted patch that would cause a .rej file to shells/zsh (in a test environment of course) and then bumped the PORTREVISION so portupgrade would see the port as updated. Portupgrade attempted to update the port, but failed and didn't uninstall the existing zsh. So, I wasn't able to reproduce the bug. This issue may be something specific to the devel/llvm-devel port (I saw strange issues with that port when trying to build it without portupgrade) or something that has been fixed in portupgrade since this PR was opened. Are you still seeing the issue? If not, I'll close the bug. Thanks, Steve -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (FreeBSD) iQEcBAEBAgAGBQJOUdXjAAoJEPXPYrMgexuhyaUH/RfEUQlV2GUhxqLpFB8qFmyf iJXuEhbuxKaZ1k1Q9raEDQqH2JjqegZC4xqdQURZk82GISj3d+KFc1nku2V5bun0 k1nrEs7Y2ozSrAswzrlEEDvxKeTW5NQppDCgPkByIuFlzb3YgVB5hNapKN/pXOW5 B2vdFzDw05lYPkCoQKBLylhm1gZpNWYePPDEyOh+Tly3QVmT4HH3303+ontV3jQV kn2aiIAjqoAKowILtsLhW4Rp+71nC7CW/nzJgQj0DosWlcjaR5beE9h+2aivNL56 NEeA+ixnNroEY+pE8H2jvEl1g7hBrFtQhG6RjqREYUMtxYuRrEZYMIf88Ykiq58= =wSDy -----END PGP SIGNATURE----- Responsible Changed From-To: swills->ruby Back to the pool State Changed From-To: open->suspended Over to maintainer. Responsible Changed From-To: ruby->freebsd-ports-bugs Over to maintainer. State Changed From-To: suspended->open This should not be suspended. bapt 2012-06-02 09:48:45 UTC
FreeBSD ports repository
Modified files:
ports-mgmt/portupgrade-devel Makefile distinfo pkg-descr
pkg-plist
Log:
Port changes
- Convert to new options framework
- Sync pkg-message with devel/portupgrade
portupgrade changes
- portupgrade/portinstall -v now lists recursive depends [ports/137958]
- portupgrade lists new version after upgrade in results
- Fixed failure being seen as success due to broken script(1) [ports/147242,
ports/131111]
- A fixed script(1) is now included for systems < 8.1
- Expanded pkgng support
PR: ports/168548 which fixes: ports/137958 ports/147242 ports/131111
Submitted by: Bryan Drewery <bryan@shatow.net>
Revision Changes Path
1.286 +14 -4 ports/ports-mgmt/portupgrade-devel/Makefile
1.195 +2 -2 ports/ports-mgmt/portupgrade-devel/distinfo
1.24 +1 -2 ports/ports-mgmt/portupgrade-devel/pkg-descr
1.43 +3 -0 ports/ports-mgmt/portupgrade-devel/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Fixed in portupgrade-devel Author: bdrewery Date: Sun Aug 26 03:15:31 2012 New Revision: 303176 URL: http://svn.freebsd.org/changeset/ports/303176 Log: - Update to 2.4.9.8 Changelog: * Fix MOVED tracking when upgrading ports [1] * Track and display deleted ports when upgrading * Automatically set DISABLE_CONFLICTS when moving origins * Fix crash when running portupgrade inside of a WRKDIR * Fix "Frozen string" error with ruby 1.9 when using the {BEFORE,AFTER}{INSTALL,DEINSTALL} hooks in pkgtools.conf * Fix failure being seen as success due to broken script(1) on older systems [2][3]. This is done by installing a more recent script(1) into PREFIX/libexec/pkgtools and using it instead. Only installed/used on FreeBSD 8.0 and earlier. PR: ports/151662 [1], ports/147242 [2], ports/131111 [3] Approved by: eadler (mentor) Modified: head/ports-mgmt/portupgrade/Makefile head/ports-mgmt/portupgrade/distinfo head/ports-mgmt/portupgrade/pkg-plist Modified: head/ports-mgmt/portupgrade/Makefile ============================================================================== --- head/ports-mgmt/portupgrade/Makefile Sun Aug 26 02:54:49 2012 (r303175) +++ head/ports-mgmt/portupgrade/Makefile Sun Aug 26 03:15:31 2012 (r303176) @@ -6,7 +6,7 @@ # PORTNAME= portupgrade -PORTVERSION= 2.4.9.7 +PORTVERSION= 2.4.9.8 PORTEPOCH= 2 CATEGORIES= ports-mgmt MASTER_SITES= SF/portupgrade/pkgtools/dist/ \ @@ -29,12 +29,13 @@ BDB4_DESC= Use Berkeley DB >=2 CONFLICTS_INSTALL= portupgrade-devel-* +DIST_SUBDIR= ${PORTNAME} USE_BZIP2= yes USE_RUBY= yes USE_LDCONFIG= ${PREFIX}/lib/compat/pkg -MAKE_ARGS= PREFIX="${PREFIX}" RUBY="${RUBY}" +MAKE_ARGS= PREFIX="${PREFIX}" RUBY="${RUBY}" RUBY_SITELIBDIR="${RUBY_SITELIBDIR}" MKDIR="${MKDIR}" MAN1= pkg_deinstall.1 \ pkg_fetch.1 \ @@ -76,6 +77,14 @@ RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb RUN_DEPENDS+= ${RUBY_SITELIBDIR}/parsedate.rb:${PORTSDIR}/devel/ruby-date2 .endif +# Need to install working script(1) +.if ${OSVERSION} < 801000 +PLIST_SUB+= SCRIPT="" +MAKE_ENV+= NEED_COMPAT_SCRIPT=yes +.else +PLIST_SUB+= SCRIPT="@comment " +.endif + pre-extract: .if exists(${RUBY_SITEARCHLIBDIR}/bdb.so) && ${PORT_OPTIONS:MBDB1} @${ECHO_MSG} "=================================================================" Modified: head/ports-mgmt/portupgrade/distinfo ============================================================================== --- head/ports-mgmt/portupgrade/distinfo Sun Aug 26 02:54:49 2012 (r303175) +++ head/ports-mgmt/portupgrade/distinfo Sun Aug 26 03:15:31 2012 (r303176) @@ -1,2 +1,2 @@ -SHA256 (pkgtools-2.4.9.7.tar.bz2) = 9aa5eb67fc4a48d721f36491eca45d7a05760886bae768d498b962bf5fc58cd3 -SIZE (pkgtools-2.4.9.7.tar.bz2) = 80323 +SHA256 (portupgrade/pkgtools-2.4.9.8.tar.bz2) = 3368982aa7c27aa754485f546dff7c56715423074709582bbd4705d786058529 +SIZE (portupgrade/pkgtools-2.4.9.8.tar.bz2) = 83214 Modified: head/ports-mgmt/portupgrade/pkg-plist ============================================================================== --- head/ports-mgmt/portupgrade/pkg-plist Sun Aug 26 02:54:49 2012 (r303175) +++ head/ports-mgmt/portupgrade/pkg-plist Sun Aug 26 03:15:31 2012 (r303176) @@ -26,6 +26,12 @@ sbin/portversion %%RUBY_SITELIBDIR%%/portinfo.rb %%RUBY_SITELIBDIR%%/ports.rb %%RUBY_SITELIBDIR%%/portsdb.rb +@dirrmtry %%RUBY_SITELIBDIR%% +@dirrmtry lib/ruby/site_ruby +@dirrmtry lib/ruby +%%SCRIPT%%@exec mkdir -p %D/libexec/pkgtools 2> /dev/null +%%SCRIPT%%libexec/pkgtools/script +%%SCRIPT%%@dirrm libexec/pkgtools @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi etc/pkgtools.conf.sample @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" |