[devscripts] 01/01: origtargz: Call rm -rf with "--"

[Joachim Breitner]

This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch master
in repository devscripts.

commit 0d792be21c70a3eca4e48625bb0e667aa85306c4
Author: Joachim Breitner <nomeata at debian.org>
Date:   Thu Aug 27 17:00:25 2015 +0200

    origtargz: Call rm -rf with "--"
    
    so that files starting with - are not considered arguments by rm.
---
 debian/changelog     | 2 ++
 scripts/origtargz.pl | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 36d35ac..262a4ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ devscripts (2.15.9) UNRELEASED; urgency=medium
   * debcommit:
     + Detect git repositories even if .git is a file instead of a directory,
       as it can be the case with "git worktree" worktrees.
+  * origtargz: Call rm -rf with "--", so that files starting with - are not
+    considered arguments by rm.
 
   [ James McCoy ]
   * bts:
diff --git a/scripts/origtargz.pl b/scripts/origtargz.pl
index ee20715..4c404a5 100755
--- a/scripts/origtargz.pl
+++ b/scripts/origtargz.pl
@@ -317,7 +317,7 @@ sub clean_checkout ()
 		push @rm, $file;
 	}
 	close DIR;
-	system ('rm', '-rf', @rm);
+	system ('rm', '-rf', '--', @rm);
 }
 
 sub unpack_tarball ($)
@@ -349,7 +349,7 @@ sub unpack_tarball ($)
 	opendir DIR, $directory or die "opendir $directory: $!";
 	foreach my $file (readdir DIR) {
 		if ($file eq 'debian') {
-			system ('rm', '-rf', "$directory/$file");
+			system ('rm', '-rf', '--', "$directory/$file");
 			next;
 		} elsif ($file eq '.' or $file eq '..') {
 			next;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git