documentation fixes for reprepro
I've prepared a backport of some bugfixes from reprepro 0.4 (which
I did not upload to unstable open for possible updates) to reprepro 0.3
(which currently is in unstable and testing).
So I wanted to ask if this could go into testing (given the autobuilders
compile it fast enough, it is priority extra). Or if I should change
anything or refrain from uploading to save autobuilders time for other
packages.
The changes are in documentation and fixing two bugs: one not showing
a error message due to a segfault and one not showing a error message
in a given case. (Which is easier to fix this three lines than to warn
long and broad in the documentation what will happen)
The interdiff of the .diff.gz files is:
diff -u reprepro-0.3/debian/changelog reprepro-0.3/debian/changelog
--- reprepro-0.3/debian/changelog
+++ reprepro-0.3/debian/changelog
@@ -1,3 +1,15 @@
+reprepro (0.3-2) unstable; urgency=low
+
+ * update short-howto (document changes
+ made in 0.3 and other updates) (closes: 303570)
+ * fix typo in manpage
+ * do not silently ignore too many arguments
+ for include* commands.
+ * do not segfault when nonexistant distribution
+ is given for include commands.
+
+ -- Bernhard R. Link <brlink@debian.org> Tue, 31 May 2005 13:58:35 +0200
+
reprepro (0.3-1) unstable; urgency=low
* new version:
only in patch2:
unchanged:
--- reprepro-0.3.orig/signature.c
+++ reprepro-0.3/signature.c
@@ -152,8 +152,10 @@
#else
if( status == GPGME_SIG_STAT_GOOD ) {
#endif
-
- if( key == NULL || containskey(key,fingerprint) ) {
+ retvalue r = (key==NULL) ?
+ RET_OK :
+ containskey(key,fingerprint);
+ if( RET_IS_OK(r) ) {
result = RET_OK;
if( verbose <= 3 )
break;
only in patch2:
unchanged:
--- reprepro-0.3.orig/upgradelist.c
+++ reprepro-0.3/upgradelist.c
@@ -372,11 +372,12 @@
free(packagename);
return RET_NOTHING;
}
- if( versioncmp <= 0 && current->version == current->new_version
+ if( versioncmp != 0 && current->version == current->new_version
&& current->version_in_use != NULL ) {
- /* The version to include is less than the newest
- * version we found, but it is also not the same like
- * the version we already have? */
+ /* The version to include is not the newest after the
+ * last deletion round), but maybe older, maybe newer.
+ * So we get to the question: it is also not the same
+ * like the version we already have? */
int vcmp = 1;
(void)dpkgversions_cmp(version,current->version_in_use,&vcmp);
if( vcmp == 0 ) {
only in patch2:
unchanged:
--- reprepro-0.3.orig/main.c
+++ reprepro-0.3/main.c
@@ -963,7 +963,7 @@
bool_t isudeb;
const char *overridefile;
- if( argc < 3 ) {
+ if( argc != 3 ) {
fprintf(stderr,"reprepro [--delete] include[u]deb <distribution> <package>\n");
return RET_ERROR;
}
@@ -992,7 +992,6 @@
result = distribution_get(&distribution,confdir,argv[1]);
assert( result != RET_NOTHING );
if( RET_WAS_ERROR(result) ) {
- override_free(override);
return result;
}
@@ -1036,7 +1035,7 @@
struct distribution *distribution;
struct overrideinfo *srcoverride;
- if( argc < 3 ) {
+ if( argc != 3 ) {
fprintf(stderr,"reprepro [--delete] includedsc <distribution> <package>\n");
return RET_ERROR;
}
@@ -1080,7 +1079,7 @@
struct distribution *distribution;
struct alloverrides ao;
- if( argc < 3 ) {
+ if( argc != 3 ) {
fprintf(stderr,"reprepro [--delete] include <distribution> <.changes-file>\n");
return RET_ERROR;
}
only in patch2:
unchanged:
--- reprepro-0.3.orig/docs/short-howto
+++ reprepro-0.3/docs/short-howto
@@ -15,9 +15,8 @@
Version: 3.0
Architectures: i386 sparc mips source
Components: main non-free contrib
-UDebComponents: main
Description: Debian woody + woody/non-US + woody/updates
-#Update: security woody swoody
+#Update: debian non-US security
#SignWith: yes
or:
@@ -29,15 +28,17 @@
Version: 3.0
Architectures: i386 source
Components: main non-free contrib bad protected server
+UDebComponents: main
Description: PCPool specific (or backported) packages
SignWith: yes
-Override: override
-SourceOverride: srcoverride
+DebOverride: override
+UDebOverride: override
+DscOverride: srcoverride
Multiple such entries are seperated with an empty line.
The codename is used to determine the directory to create,
the Update line is described later, when SignWith is there,
-it will try to sign it. (It cannot yet be use to tell which
+it will try to sign it. (It cannot yet be used to tell which
key to use).
The other fields are copies into the appropiate Release files
generated.
@@ -47,7 +48,7 @@
To add a .deb manually:
-reprepro -Vb . includedeb pcpool /lhome/aptcache/zoggy_0.91-3_i386.deb
+reprepro -Vb . includedeb pcpool /var/cache/apt/archives/libc6_2.2.5-11.8_i386.deb
to add a .changes file:
@@ -62,30 +63,30 @@
3) to remove files:
-reprepro -Vb . remove pcpool zoggy
+reprepro -Vb . remove pcpool libc6
to only delete in a specific component or architecture:
-reprepro -Vb . -C main -A i386 remove pcpool zoggy
-
-Note: this only removes it out of the database for this distribution.
-To delete the physical files, try:
-
-reprepro -Vb . deleteunrefereced
+reprepro -Vb . -C main -A i386 remove pcpool libc6
4) getting informations:
To see in which architectures/components a packages exists and which version it uses.
-reprepro -b . list pcpool zoggy
+reprepro -b . list pcpool libc6
5) Override-Files
When including packages via includedeb, includedsc or include
the applicaple override file from the distribution it is placed
-into is used. The file given by Override for .deb's the file
-given by SourceOverride for .dsc's. If the filename starts with
+into is used. The file given by DebOverride for ".deb"s, the
+file given by UDebOverride for ".udeb"s and the file given by
+DscOverride for ".dsc"s. If the filename starts with
a slash (/) it is not relative to the override directory given
-with -o. Note that the Format is those of apt-ftparchive's
-ExtraOverride, not the old format.
+with --override (Default is basedir + "override").
+
+Note that the Format is those of apt-ftparchive's ExtraOverride, not the old format.
+An (stupid) example line for that file would be:
+libc6 Priority extra
+
6) importing from upstream represetories
@@ -93,7 +94,7 @@
Name: debian
Method: http://ftp.debian.de/debian
-VerifyRelease: 6FFA8EF91DB114E0
+VerifyRelease: F1D53D8C4F368D5D
Name: non-US
Method: http://ftp.debian.de/debian-non-US
@@ -107,7 +108,7 @@
Method: http://security.debian.org/debian-security
Suite: */updates
UDebComponents: none
-VerifyRelease: 6FFA8EF91DB114E0
+VerifyRelease: F1D53D8C4F368D5D
Which of those are used is determined by the "Update:" line
in the description in conf/distributions. When "Suite:",
only in patch2:
unchanged:
--- reprepro-0.3.orig/docs/reprepro.1
+++ reprepro-0.3/docs/reprepro.1
@@ -121,7 +121,7 @@
it was in.
.TP
.B \-\-keepunneededlists
-Do not try to delete files from \fBlists/f\P before updating, that seem to
+Do not try to delete files from \fBlists/\fP before updating, that seem to
belong to one of the updated distributions but will not be needed.
Those file may happen to exist when you removed
some Update: rule or changed Components/Architectures/... .
Thanks in advance,
Bernhard R. Link
Reply to: