[arch-commits] Commit in devtools/repos/extra-any (3 files)

[Evangelos Foutras]

    Date: Thursday, April 27, 2017 @ 04:36:19
  Author: foutrelis
Revision: 294878

archrelease: copy trunk to extra-any

Added:
  devtools/repos/extra-any/0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch
    (from rev 294877, devtools/trunk/0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch)
  devtools/repos/extra-any/PKGBUILD
    (from rev 294877, devtools/trunk/PKGBUILD)
Deleted:
  devtools/repos/extra-any/PKGBUILD

-----------------------------------------------------------------+
 0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch |   27 ++++
 PKGBUILD                                                        |   65 +++++-----
 2 files changed, 63 insertions(+), 29 deletions(-)

Copied: devtools/repos/extra-any/0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch (from rev 294877, devtools/trunk/0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch)
===================================================================
--- 0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch	                        (rev 0)
+++ 0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch	2017-04-27 04:36:19 UTC (rev 294878)
@@ -0,0 +1,27 @@
+From a1f8ac9c70494009554c08c1036351cb2b374828 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Sun, 9 Apr 2017 02:36:01 +0200
+Subject: [PATCH] makechrootpkg: Delete chroot subvols recursively when using
+ -T
+
+I overlooked this one. Fixes FS#53513.
+---
+ makechrootpkg.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/makechrootpkg.in b/makechrootpkg.in
+index f6764cb..20a1f50 100644
+--- a/makechrootpkg.in
++++ b/makechrootpkg.in
+@@ -143,7 +143,7 @@ delete_chroot() {
+ 
+ 	stat_busy "Removing chroot copy [%s]" "$copy"
+ 	if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then
+-		btrfs subvolume delete "$copydir" >/dev/null ||
++		subvolume_delete_recursive "$copydir" ||
+ 			die "Unable to delete subvolume %s" "$copydir"
+ 	else
+ 		# avoid change of filesystem in case of an umount failure
+-- 
+2.12.2
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-27 04:35:54 UTC (rev 294877)
+++ PKGBUILD	2017-04-27 04:36:19 UTC (rev 294878)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=devtools
-pkgver=20170320
-pkgrel=1
-pkgdesc='Tools for Arch Linux package maintainers'
-arch=('any')
-license=('GPL')
-url='http://projects.archlinux.org/devtools.git/'
-depends=('namcap' 'openssh' 'subversion' 'rsync' 'arch-install-scripts')
-source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
-validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'
-              '4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC'
-              '86CFFCA918CF3AF47147588051E8B148A9999C34'
-              '8FC15A064950A99DD1BD14DD39E4B877E62EB915'
-              '8218F88849AAC522E94CF470A5E9288C4FA415FA')
-md5sums=('e401f4e3d1074b80060390b9812766f1'
-         'SKIP')
-
-build() {
-	cd "${pkgname}-${pkgver}"
-	make PREFIX=/usr
-}
-
-package() {
-	cd "${pkgname}-${pkgver}"
-	make PREFIX=/usr DESTDIR=${pkgdir} install
-}

Copied: devtools/repos/extra-any/PKGBUILD (from rev 294877, devtools/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-04-27 04:36:19 UTC (rev 294878)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=devtools
+pkgver=20170320
+pkgrel=2
+pkgdesc='Tools for Arch Linux package maintainers'
+arch=('any')
+license=('GPL')
+url='http://projects.archlinux.org/devtools.git/'
+depends=('namcap' 'openssh' 'subversion' 'rsync' 'arch-install-scripts')
+source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+        '0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch')
+validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'
+              '4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC'
+              '86CFFCA918CF3AF47147588051E8B148A9999C34'
+              '8FC15A064950A99DD1BD14DD39E4B877E62EB915'
+              '8218F88849AAC522E94CF470A5E9288C4FA415FA')
+md5sums=('e401f4e3d1074b80060390b9812766f1'
+         'SKIP'
+         '678ec14b148dbe88cbac92a1cefa57d5')
+
+prepare() {
+	cd "${pkgname}-${pkgver}"
+	patch -Np1 -i ../0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch
+}
+
+build() {
+	cd "${pkgname}-${pkgver}"
+	make PREFIX=/usr
+}
+
+package() {
+	cd "${pkgname}-${pkgver}"
+	make PREFIX=/usr DESTDIR=${pkgdir} install
+}