tags 354462 + patch pending thanks Adeodato Simó <[EMAIL PROTECTED]> writes:
> sbuild-setup(7) hints in step "7. sbuild setup" that schroot is
> capable of creating the mentioned directories at the start of each
> build. However, /etc/schroot/run.d/50sbuild only creates
> /build/sbuild, and not /var/lib/sbuild/srcdep-lock with the proper
> permissions, causing sbuild to fail.
>
> As it seems, the attached patch fixes the issue.
Many thanks for the patch, it's much appreciated! I've applied this
to upstream CVS (full patch attached).
Many thanks!
Roger
--
Roger Leigh
Printing on GNU/Linux? http://gutenprint.sourceforge.net/
Debian GNU/Linux http://www.debian.org/
GPG Public Key: 0x25BFB848. Please sign and encrypt your mail.
? schroot/sbuild-sourcedeps.cc
? schroot/sbuild-sourcedeps.h
Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildd-tools/schroot/ChangeLog,v
retrieving revision 1.249
diff -u -r1.249 ChangeLog
--- ChangeLog 26 Feb 2006 20:20:54 -0000 1.249
+++ ChangeLog 26 Feb 2006 21:03:01 -0000
@@ -1,5 +1,15 @@
2006-02-26 Roger Leigh <[EMAIL PROTECTED]>
+ * debian/changelog: Update.
+
+ * schroot/run/50sbuild: Create
+ ${CHROOT_PATH}/var/lib/sbuild/srcdep-lock and set ownership and
+ permissions of all files under ${CHROOT_PATH}/var/lib/sbuild to
+ root:sbuild and 02775, respectively. Thanks to Adeodato Simó for
+ this patch.
+
+2006-02-26 Roger Leigh <[EMAIL PROTECTED]>
+
* schroot/schroot.1.in: Correct the --help options. Thanks to
Clint Adams for this patch.
Index: debian/changelog
===================================================================
RCS file: /cvsroot/buildd-tools/schroot/debian/changelog,v
retrieving revision 1.40
diff -u -r1.40 changelog
--- debian/changelog 25 Feb 2006 13:50:42 -0000 1.40
+++ debian/changelog 26 Feb 2006 21:03:02 -0000
@@ -1,3 +1,12 @@
+schroot (0.2.5-1) UNRELEASED; urgency=low
+
+ * schroot/run/50sbuild: Create ${CHROOT_PATH}/var/lib/sbuild/srcdep-lock
+ and set ownership and permissions of all files under
+ ${CHROOT_PATH}/var/lib/sbuild to root:sbuild and 02775, respectively.
+ Thanks to Adeodato Simó for this patch (Closes: #354462).
+
+ --
+
schroot (0.2.4-1) unstable; urgency=low
* New upstream release.
Index: schroot/run/50sbuild
===================================================================
RCS file: /cvsroot/buildd-tools/schroot/schroot/run/50sbuild,v
retrieving revision 1.2
diff -u -r1.2 50sbuild
--- schroot/run/50sbuild 24 Feb 2006 20:26:07 -0000 1.2
+++ schroot/run/50sbuild 26 Feb 2006 21:03:02 -0000
@@ -27,6 +27,23 @@
fi
chmod 770 "${CHROOT_PATH}/build/${AUTH_USER}"
+ if [ ! -d "${CHROOT_PATH}/var/lib/sbuild/srcdep-lock" ]; then
+ if [ "$AUTH_VERBOSITY" = "verbose" ]; then
+ echo "Creating srcdep-lock directory: ${CHROOT_PATH}/var/lib/sbuild/srcdep-lock"
+ fi
+ mkdir -p "${CHROOT_PATH}/var/lib/sbuild/srcdep-lock"
+ fi
+
+ if [ "$AUTH_VERBOSITY" = "verbose" ]; then
+ echo "Setting ownership of ${CHROOT_PATH}/var/lib/sbuild to root:sbuild"
+ fi
+ chown -R root:sbuild "${CHROOT_PATH}/var/lib/sbuild"
+
+ if [ "$AUTH_VERBOSITY" = "verbose" ]; then
+ echo "Setting permissions of ${CHROOT_PATH}/var/lib/sbuild to 02775"
+ fi
+ chmod -R 02775 "${CHROOT_PATH}/var/lib/sbuild"
+
else
if [ "$AUTH_VERBOSITY" = "verbose" ]; then
pgp1d8KRuBzoO.pgp
Description: PGP signature
