openmamba/distromatic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split cleanhtml into cleanhtml() and cleanhtmlPackagesFiles() for late and early cleaning respectively

Browse Source
This commit is contained in:
Silvan Calarco 2012-04-15 15:41:06 +02:00
parent 452fcef5f0
commit 222691ea78
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/distromatic.c
View File

@ -1171,6 +1171,12 @@ main(int argc, char *argv[])
if (genheader_mode) { if (genheader_mode) {
if (mode & MODE_HTML) {
logmsg(LOG_DEBUG,"cleanHTMLPackagesFiles - start");
cleanHTMLPackagesFiles(configtag);
logmsg(LOG_DEBUG,"cleanHTMLPackagesFiles - done");
}
for (i = 0; i < ARCHS_MAX && configtag->arch[i]; i++) { for (i = 0; i < ARCHS_MAX && configtag->arch[i]; i++) {
if (!quietmode) if (!quietmode)
@ -1330,7 +1336,6 @@ main(int argc, char *argv[])
} }
if (mode & MODE_HTML) { if (mode & MODE_HTML) {
/* currheaderlist = headerlist; */
logmsg(LOG_DEBUG,"cleanHTMLFiles - start"); logmsg(LOG_DEBUG,"cleanHTMLFiles - start");
cleanHTMLFiles(configtag); cleanHTMLFiles(configtag);
logmsg(LOG_DEBUG,"cleanHTMLFiles - done"); logmsg(LOG_DEBUG,"cleanHTMLFiles - done");

1
src/include/reports.h
View File

@ -21,6 +21,7 @@ int printHTMLWarnings(FILE *fout,struct configTag *configtag, struct headerSourc
void printpkgicon(FILE *fout, struct configTag *configtag, struct headerSourceList *s); void printpkgicon(FILE *fout, struct configTag *configtag, struct headerSourceList *s);
int generateStats(struct configTag *configtag,int arch); int generateStats(struct configTag *configtag,int arch);
int cleanHTMLFilesInc(char* dir); int cleanHTMLFilesInc(char* dir);
int cleanHTMLPackagesFiles(struct configTag *ct);
int cleanHTMLFiles(struct configTag *ct); int cleanHTMLFiles(struct configTag *ct);
int generateHTMLFiles(struct configTag *configtag,int arch); int generateHTMLFiles(struct configTag *configtag,int arch);
int generateHTML_SRPMSFiles(struct configTag *configtag); int generateHTML_SRPMSFiles(struct configTag *configtag);

16
src/reports.c
View File

@ -1315,16 +1315,28 @@ cleanHTMLFilesInc(char* dir)
return 0; return 0;
} }
int
cleanHTMLPackagesFiles(struct configTag *ct)
{
char dir[PATH_MAX];
snprintf(dir,PATH_MAX,"%spackages",ct->html_dir);
if (cleanHTMLFilesInc(dir)) {
logmsg(LOG_WARNING,"cannot clean %s directory",dir);
}
return 0;
}
int int
cleanHTMLFiles(struct configTag *ct) cleanHTMLFiles(struct configTag *ct)
{ {
int s; int s;
char uf[PATH_MAX],dir[PATH_MAX]; char uf[PATH_MAX],dir[PATH_MAX];
const char* clean_subdir[] = { "", "packages", "maintainers" }; const char* clean_subdir[] = { "", "maintainers" };
struct headerSourceList *currheadersourcelist; struct headerSourceList *currheadersourcelist;
struct stat buf; struct stat buf;
for (s = 0; s < 3; s++) { for (s = 0; s < 2; s++) {
snprintf(dir,PATH_MAX,"%s%s",ct->html_dir,clean_subdir[s]); snprintf(dir,PATH_MAX,"%s%s",ct->html_dir,clean_subdir[s]);
if (cleanHTMLFilesInc(dir)) { if (cleanHTMLFilesInc(dir)) {
logmsg(LOG_WARNING,"cannot clean %s directory",dir); logmsg(LOG_WARNING,"cannot clean %s directory",dir);