Refactor coping with maybe-existing files in fake dsc

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 7c76a6f5473f6fc97b3fa1b0e1de902c9653faa6..2434f6a2fb5c2e23d67aa3cd6e02633449a11f9a 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1761,6 +1761,10 @@ sub check_not_dirty () {
     } else {
        failedcmd @cmd;
     }
+
+    if (stat_exists "debian/source/local-options") {
+       fail "git tree contains debian/source/local-options";
+    }
 }
 
 sub commit_admin ($) {
@@ -2804,8 +2808,9 @@ END
     }
 
     my @files=qw(debian/source/format debian/rules);
-    if (stat_exists '../../../debian/patches') {
-        push @files, 'debian/patches';
+    foreach my $maybe (qw(debian/patches)) {
+        next unless stat_exists "../../../$maybe";
+        push @files, $maybe;
     }
 
     my $debtar= srcfn $fakeversion,'.debian.tar.gz';