Hi ports@,
This small diff (hopefully) fixes the error on the last cvs command of
portimport(1):
cvs server: failed to create lock directory for `/cvs' (/cvs/#cvs.lock):
Permission denied
cvs server: failed to obtain dir lock in repository `/cvs'
cvs [server aborted]: read lock failed - giving up
It should remove the read lock which means the update command may be
executed in the middle of another user's commit. But the chances of
that being a problem in this case are minimal, as this is executed on a
folder that the user of portimport(1) just imported to the tree.
comments ? ok ?
Index: infrastructure/bin/portimport
===================================================================
RCS file: /home/cvs/ports/infrastructure/bin/portimport,v
retrieving revision 1.7
diff -u -p -r1.7 portimport
--- infrastructure/bin/portimport 20 Dec 2019 19:52:26 -0000 1.7
+++ infrastructure/bin/portimport 18 Feb 2020 11:23:47 -0000
@@ -68,7 +68,7 @@ if [[ $ans == +(y|Y) ]]; then
cvs -d$cvsroot import ports/$pkgpath $user ${user}_$timestamp
grep -q "^@new" pkg/P* && echo "New users/groups, remember to commit
infrastructure/db/user.list!"
cd "$portsdir/${pkgpath%/*}"
- cvs -d$cvsroot update -AdP ${pkgpath##*/}
+ cvs -R -d$cvsroot update -AdP ${pkgpath##*/}
echo "Don't forget to commit the ${pkgpath%/*}/Makefile when you're
done!"
pwd
fi
--
Paco Esteban.
5818130B8A6DBC03
