RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 04-Jun-2011 09:56:46
Branch: HEAD Handle: 2011060407564600
Modified files:
rpm/tools rpmdigest.c
Log:
add dirs to rpmdigest --0install manifest
Summary:
Revision Changes Path
2.19 +12 -1 rpm/tools/rpmdigest.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tools/rpmdigest.c
============================================================================
$ cvs diff -u -r2.18 -r2.19 rpmdigest.c
--- rpm/tools/rpmdigest.c 10 Oct 2009 13:57:00 -0000 2.18
+++ rpm/tools/rpmdigest.c 4 Jun 2011 07:56:46 -0000 2.19
@@ -721,6 +721,7 @@
{
char *const * paths = (char * const *) dc->paths;
int ftsoptions = dc->ftsoptions;
+ int toplen = 0;
int rval = 0;
dc->t = Fts_open(paths, ftsoptions,
@@ -754,8 +755,18 @@
(void) rpmdcVisitD(dc);
#endif
/* XXX don't visit topdirs for 0install. */
- if (F_ISSET(dc, 0INSTALL) && dc->p->fts_level > 0)
+ if (F_ISSET(dc, 0INSTALL) && dc->p->fts_level > 0) {
+ char *dir = dc->p->fts_path + toplen;
+ char *t;
+ t = rpmExpand("D ", dir, "\n", NULL);
+ size_t nb = strlen(t);
+ nb = Fwrite(t, nb, sizeof(*t), dc->ofd);
+ (void) Fflush(dc->ofd);
+ t = _free(t);
rpmdcVisitF(dc);
+ }
+ else if (F_ISSET(dc, 0INSTALL) && dc->p->fts_level == 0)
+ toplen = dc->p->fts_pathlen;
/*@switchbreak@*/ break;
case FTS_DP:
#ifdef NOTYET
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
