diff options
| author |   espie <espie@openbsd.org> | 2007-12-28 12:57:13 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2007-12-28 12:57:13 +0000 |
| commit | 8181c0794e621a67583e1b26cc2597ed04f177ee (patch) | |
| tree | 3c4711ea7231bd11e1d266b7e8024419e46066a1 | |
| parent | tweak the semantics so that no-default-conflict works. (diff) | |
| download | wireguard-openbsd-8181c0794e621a67583e1b26cc2597ed04f177ee.tar.xz wireguard-openbsd-8181c0794e621a67583e1b26cc2597ed04f177ee.zip | |
allows src: urls to work better by using -F nolock during pkg builds.
Also turns off ftp package fetching, as noticed by bernd@
With this, src: urls should be mostly functional now.
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackageRepository/Source.pm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Source.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Source.pm index 732f2a0b7d3..39e8708a7b9 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Source.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Source.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Source.pm,v 1.6 2007/06/16 09:29:37 espie Exp $ +# $OpenBSD: Source.pm,v 1.7 2007/12/28 12:57:13 espie Exp $ # # Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org> # @@ -56,10 +56,7 @@ sub build_package my $pkgfile = `cd $dir && SUBDIR=$pkgpath ECHO_MSG=: $make show=PKGFILE`; chomp $pkgfile; if (! -f $pkgfile) { - # XXX - unlock_db(); - system "cd $dir && SUBDIR=$pkgpath $make package BULK=Yes"; - lock_db(0); + system "cd $dir && SUBDIR=$pkgpath $make package BULK=Yes PKGDB_LOCK='-F nolock' FETCH_PACKAGES=No"; } if (! -f $pkgfile) { return undef; |