Browse Source

dpkg-split: Ignore minor format version number changes

This unifies the behaviour with the deb binary format.
Guillem Jover 14 years ago
parent
commit
b7883f7836
3 changed files with 10 additions and 7 deletions
  1. 2 0
      debian/changelog
  2. 1 1
      dpkg-split/info.c
  3. 7 6
      man/deb-split.5

+ 2 - 0
debian/changelog

@@ -25,6 +25,8 @@ dpkg (1.16.3) UNRELEASED; urgency=low
   * Handle deb format versions as major.minor integers instead of strings or
   * Handle deb format versions as major.minor integers instead of strings or
     floats, the latter being susceptible to parsing errors depending on the
     floats, the latter being susceptible to parsing errors depending on the
     current locale (although this was only affecting the old deb format).
     current locale (although this was only affecting the old deb format).
+  * Ignore the minor format version number for deb-split format, unifying
+    the behaviour with the deb format.
 
 
   [ Helge Kreutzmann ]
   [ Helge Kreutzmann ]
   * Fix a typo in man/dpkg-buildflags.1.
   * Fix a typo in man/dpkg-buildflags.1.

+ 1 - 1
dpkg-split/info.c

@@ -125,7 +125,7 @@ struct partinfo *read_info(FILE *partfile, const char *fn, struct partinfo *ir)
                           nextline(&rip, fn, _("format version number")));
                           nextline(&rip, fn, _("format version number")));
   if (err)
   if (err)
     ohshit(_("file '%.250s' has invalid format version: %s"), fn, err);
     ohshit(_("file '%.250s' has invalid format version: %s"), fn, err);
-  if (ir->fmtversion.major != 2 || ir->fmtversion.minor != 1)
+  if (ir->fmtversion.major != 2)
     ohshit(_("file '%.250s' is format version %d.%d; get a newer dpkg-split"),
     ohshit(_("file '%.250s' is format version %d.%d; get a newer dpkg-split"),
            fn, ir->fmtversion.major, ir->fmtversion.minor);
            fn, ir->fmtversion.major, ir->fmtversion.minor);
 
 

+ 7 - 6
man/deb-split.5

@@ -1,6 +1,6 @@
 .\" dpkg manual page - deb-split(5)
 .\" dpkg manual page - deb-split(5)
 .\"
 .\"
-.\" Copyright © 2009-2011 Guillem Jover <guillem@debian.org>
+.\" Copyright © 2009-2012 Guillem Jover <guillem@debian.org>
 .\"
 .\"
 .\" This is free software; you can redistribute it and/or modify
 .\" This is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
 .\" it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 .\" You should have received a copy of the GNU General Public License
 .\" You should have received a copy of the GNU General Public License
 .\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
 .\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
 .
 .
-.TH deb\-split 5 "2011-07-04" "Debian Project" "Debian"
+.TH deb\-split 5 "2012-04-09" "Debian Project" "Debian"
 .SH NAME
 .SH NAME
 deb\-split \- Debian multi-part binary package format
 deb\-split \- Debian multi-part binary package format
 .SH SYNOPSIS
 .SH SYNOPSIS
@@ -48,11 +48,12 @@ parts (as in \(oq1/10\(cq).
 .IP \(bu
 .IP \(bu
 The package architecture (since dpkg 1.16.1).
 The package architecture (since dpkg 1.16.1).
 .PP
 .PP
-Programs which read multi-part archives should be prepared for additional
-lines to be present, and should ignore these if this is the case.
+Programs which read multi-part archives should be prepared for the minor
+format version number to be increased and additional lines to be present,
+and should ignore these if this is the case.
 .PP
 .PP
-If the version number has changed, an incompatible change has been made
-and the program should stop. If it has not, then the program should
+If the major format version number has changed, an incompatible change has
+been made and the program should stop. If it has not, then the program should
 be able to safely continue, unless it encounters an unexpected member
 be able to safely continue, unless it encounters an unexpected member
 in the archive (except at the end), as described below.
 in the archive (except at the end), as described below.
 .PP
 .PP