[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Review of file exclusion branch requested

* Frank Lichtenheld 

| On Sat, Jan 05, 2008 at 11:18:13AM +0100, Tollef Fog Heen wrote:
| > I've finally gotten around to fixing up my support for excluding bits
| > of packages as they are unpacked.  It can be gotten from
| > git://git.err.no/dpkg in the master branch (sorry about that, it
| > should probably have gone in a separate branch).
| > 
| > It's still missing in the documentation department, but it seems to
| > work fine for me in my somewhat light testing.
| Just some nitpicks:
| void loadfilter(char *fn) should probably be
| void loadfilter(const char *fn)

point.  And it should be static.  (Fixed)

| At one point you try to return NULL from
| void loadfilters(). That should probably be just "return;"

| "gobble replaced file `%.255s'" should probably have
| "replaced" replaced with something more fitting.
| (IMHO this message should not even be translated, I don't
| think anybody except some very few dpkg developers can associate
| anything with it). And yeah I know you just copied that, no excuse
| to repeat errors of the past ;)

diff --git a/src/archives.c b/src/archives.c
index 9ab3158..48f1c6d 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -248,7 +248,9 @@ void tarfile_skip_one_forward(struct TarInfo *ti,
   if ((ti->Type == NormalFile0) || (ti->Type == NormalFile1)) {
     char fnamebuf[256];
-    fd_null_copy(tc->backendpipe, ti->Size, _("gobble replaced file `%.255s'"),quote_filename(fnamebuf,256,ti->Name));
+    fd_null_copy(tc->backendpipe, ti->Size,
+                "skipped unpacking file `%.255s' (replaced or excluded?)",
+                quote_filename(fnamebuf,256,ti->Name));
     r= ti->Size % TARBLKSZ;
     if (r > 0) r= safe_read(tc->backendpipe,databuf,TARBLKSZ - r);

Looks better?

Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are

Reply to: