Igor Pechtchanski writes:
> On Fri, 15 Aug 2003, David Rothenberger wrote:
>
> > I notice that package_list() prints a message in this case with the -v
> > switch, but package_find() does not. My personal pref. is for the
> > message, but I'll leave it to you to decide.
> >
> > Dave
>
> Dave,
>
> Actually, there's a reason for that (and, in fact, it used to be the way
> you described, and I changed it). If package_list() looks at a package,
> the contents of that package were requested on the command line, and thus,
> if the list file is not found, an error message makes sense. On the other
> hand, package_find() looks at *all* the packages, so if the list for one
> of them is missing (which could happen if the package is empty, for
> example), package_find() will (should, IMO) simply ignore it.
> Igor
Igor,
Yeah, that makes perfect sense, and I would have seen it was
intentional if I had looked closely at the patch. Sorry for the
false alarm.
Here's another small patch for "cygcheck -c" that strips leading ./
and / from filenames in the package lists.
I have Joshua's packages for building cygwin-doc installed, and the
entries in those packages' lists start with "./", which breaks the
postinstall check, causing them to show up as bad.
I know these are non-standard packages, but it's such a small little
fix to support them and I would really like my "cygcheck -c" output
to be clean. This gets it closer; it still complains about empty
packages like diff, but I don't see an easy way to solve that.
This patch includes all your previous changes.
Dave
======================================================================
2003-08-15 David Rothenberger <[EMAIL PROTECTED]>
* dump_setup.cc (package_find): Don't stop searching on missing
file list.
(package_list): Ditto.
(check_package_files): Strip leading ./ and / from package
contents.
2003-08-15 Igor Pechtchanski <[EMAIL PROTECTED]>
* dump_setup.cc: (package_list): Make output terse unless
verbose requested. Fix formatting.
(package_find): Ditto.
Index: dump_setup.cc
===================================================================
RCS file: /cvs/src/src/winsup/utils/dump_setup.cc,v
retrieving revision 1.10
diff -u -p -r1.10 dump_setup.cc
--- dump_setup.cc 15 Aug 2003 20:26:11 -0000 1.10
+++ dump_setup.cc 16 Aug 2003 04:21:49 -0000
@@ -276,6 +276,12 @@ check_package_files (int verbose, char *
while (fgets (buf, MAX_PATH, fp))
{
char *filename = strtok(buf, "\n");
+
+ if (*filename == '/')
+ ++filename;
+ else if (!strncmp (filename, "./", 2))
+ filename += 2;
+
if (filename[strlen (filename) - 1] == '/')
{
if (!directory_exists (verbose, filename, package))
@@ -411,21 +417,22 @@ package_list (int verbose, char **argv)
{
FILE *fp = open_package_list (packages[i].name);
if (!fp)
- {
- if (verbose)
- printf ("Can't open file list /etc/setup/%s.lst.gz for package %s\n",
- packages[i].name, packages[i].name);
- return;
- }
+ {
+ if (verbose)
+ printf ("Can't open file list /etc/setup/%s.lst.gz for package %s\n",
+ packages[i].name, packages[i].name);
+ continue;
+ }
- printf ("Package: %s-%s\n", packages[i].name, packages[i].ver);
+ if (verbose)
+ printf ("Package: %s-%s\n", packages[i].name, packages[i].ver);
char buf[MAX_PATH + 1];
while (fgets (buf, MAX_PATH, fp))
{
char *lastchar = strchr(buf, '\n');
if (lastchar[-1] != '/')
- printf (" /%s", buf);
+ printf ("%s/%s", (verbose?" ":""), buf);
}
fclose (fp);
@@ -450,12 +457,7 @@ package_find (int verbose, char **argv)
{
FILE *fp = open_package_list (packages[i].name);
if (!fp)
- {
- if (verbose)
- printf ("Can't open file list /etc/setup/%s.lst.gz for package %s\n",
- packages[i].name, packages[i].name);
- return;
- }
+ continue;
char buf[MAX_PATH + 2];
buf[0] = '/';
@@ -479,7 +481,11 @@ package_find (int verbose, char **argv)
if (!a && is_alias)
a = match_argv (argv, filename + 4);
if (a > 0)
- printf ("%s-%s\n", packages[i].name, packages[i].ver);
+ {
+ if (verbose)
+ printf ("%s: found in package ", filename);
+ printf ("%s-%s\n", packages[i].name, packages[i].ver);
+ }
}
}
