From: Russ Allbery <rra@debian.org>
Date: Tue, 20 Apr 2010 03:45:51 +0000 (-0700)
Subject: Remove newly imported upstream directory in import-upstream
X-Git-Tag: debian/1.5.74-2~11
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=0e3aacc4e8fdd8df2031ee1b7cc17c4634b3dd8a;p=packages%2Fo%2Fopenafs.git

Remove newly imported upstream directory in import-upstream

import-upstream was leaving behind a directory from unpacking the
upstream source, which under some circumstances was getting imported
into the upstream branch (if, for instance, the script was run twice
in succession).  Make sure it's gone with rm -rf.
---

diff --git a/debian/import-upstream b/debian/import-upstream
index 62a361a65..c3a8aad09 100755
--- a/debian/import-upstream
+++ b/debian/import-upstream
@@ -44,3 +44,4 @@ commit=$(echo "Imported upstream tag $upstream via tarball" | \
 git branch -f upstream-1.5 "$commit"
 git tag "$tag" "$commit"
 git rm -q -r -f "$dir"
+rm -rf "$dir"