diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-23 16:47:29 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-24 01:50:22 +0100 |
commit | 18e3479f8737622d5e3ff964652dade72f82c897 (patch) | |
tree | ffbc3e5d5842d33b5305dc60b048097df6701510 | |
parent | d6e357b6f8dae996d00fea732910d24ca82cea26 (diff) |
Provide --force-unsupported-source-format
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r-- | debian/changelog | 2 | ||||
-rwxr-xr-x | dgit | 7 | ||||
-rw-r--r-- | dgit.1 | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 0d30219..f9a21f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,7 @@ dgit (2.7~) unstable; urgency=medium Minor changes: * dgit(1): Reorder the options, moving more important ones earlier. * dgit(1): Some more info about --deliberately. - * Provide --force-unrepresentable. + * Provide various --force-something options. Please don't use them. -- @@ -74,7 +74,8 @@ our $tagformat_want; our $tagformat; our $tagformatfn; -our %forceopts = map { $_=>0 } qw(unrepresentable); +our %forceopts = map { $_=>0 } + qw(unrepresentable unsupported-source-format); our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)"); @@ -1308,7 +1309,9 @@ sub get_archive_dsc () { $dsc = parsecontrolfh($dscfh,$dscurl,1); printdebug Dumper($dsc) if $debuglevel>1; my $fmt = getfield $dsc, 'Format'; - fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt}; + $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)], + "unsupported source format $fmt, sorry"; + $dsc_checked = !!$digester; printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n"; return; @@ -736,6 +736,10 @@ dgit thinks that your git tree contains changes (relative to your .orig tarballs) which dpkg-source is not able to represent. Your build or push will probably fail later. +.TP +.B --force-unsupported-source-format +Carry on despite dgit not understanding your source package format. +dgit will probably mishandle it. .SH WORKFLOW - SIMPLE It is always possible with dgit to clone or fetch a package, make changes in git (using git-commit) on the suite branch |