| Message ID | 1516715761-3043-4-git-send-email-stefan@herbrechtsmeier.net |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/5] parser: Check image version after parsing to remove skipped images | expand |
On 23/01/2018 14:56, stefan@herbrechtsmeier.net wrote: > From: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> > > Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> > --- > > parser/parser.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/parser/parser.c b/parser/parser.c > index 6add999..739cc4c 100644 > --- a/parser/parser.c > +++ b/parser/parser.c > @@ -516,10 +516,10 @@ static int parse_images(parsertype p, void *cfg, struct swupdate_cfg *swcfg, lua > > LIST_INSERT_HEAD(&swcfg->images, image, next); > > - TRACE("Found %sImage %s %s: %s in %s : %s for handler %s%s %s\n", > + TRACE("Found %sImage%s%s%s%s: %s in %s : %s for handler %s%s%s\n", > image->compressed ? "compressed " : "", > - image->id.name, > - image->id.version, > + strlen(image->id.name) ? " " : "", image->id.name, > + strlen(image->id.version) ? " " : "", image->id.version, > image->fname, > strlen(image->volname) ? "volume" : "device", > strlen(image->volname) ? image->volname : > @@ -585,15 +585,15 @@ static int parse_files(parsertype p, void *cfg, struct swupdate_cfg *swcfg, lua_ > > LIST_INSERT_HEAD(&swcfg->images, file, next); > > - TRACE("Found %sFile %s %s: %s --> %s (%s) %s\n", > + TRACE("Found %sFile%s%s%s%s: %s --> %s (%s)%s\n", > file->compressed ? "compressed " : "", > - file->id.name, > - file->id.version, > + strlen(file->id.name) ? " " : "", file->id.name, > + strlen(file->id.version) ? " " : "", file->id.version, > file->fname, > file->path, > strlen(file->device) ? file->device : "ROOTFS", > (strlen(file->id.name) && file->id.install_if_different) ? > - "Version must be checked" : ""); > + "; Version must be checked" : ""); > } > > return 0; > Reviewed-by: Stefano Babic <sbabic@denx.de> Best regards, Stefano Babic
On 23/01/2018 14:56, stefan@herbrechtsmeier.net wrote: > From: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> > > Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> > --- > > parser/parser.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/parser/parser.c b/parser/parser.c > index 6add999..739cc4c 100644 > --- a/parser/parser.c > +++ b/parser/parser.c > @@ -516,10 +516,10 @@ static int parse_images(parsertype p, void *cfg, struct swupdate_cfg *swcfg, lua > > LIST_INSERT_HEAD(&swcfg->images, image, next); > > - TRACE("Found %sImage %s %s: %s in %s : %s for handler %s%s %s\n", > + TRACE("Found %sImage%s%s%s%s: %s in %s : %s for handler %s%s%s\n", > image->compressed ? "compressed " : "", > - image->id.name, > - image->id.version, > + strlen(image->id.name) ? " " : "", image->id.name, > + strlen(image->id.version) ? " " : "", image->id.version, > image->fname, > strlen(image->volname) ? "volume" : "device", > strlen(image->volname) ? image->volname : > @@ -585,15 +585,15 @@ static int parse_files(parsertype p, void *cfg, struct swupdate_cfg *swcfg, lua_ > > LIST_INSERT_HEAD(&swcfg->images, file, next); > > - TRACE("Found %sFile %s %s: %s --> %s (%s) %s\n", > + TRACE("Found %sFile%s%s%s%s: %s --> %s (%s)%s\n", > file->compressed ? "compressed " : "", > - file->id.name, > - file->id.version, > + strlen(file->id.name) ? " " : "", file->id.name, > + strlen(file->id.version) ? " " : "", file->id.version, > file->fname, > file->path, > strlen(file->device) ? file->device : "ROOTFS", > (strlen(file->id.name) && file->id.install_if_different) ? > - "Version must be checked" : ""); > + "; Version must be checked" : ""); > } > > return 0; > Applied to -master, thanks ! Best regards, Stefano Babic
diff --git a/parser/parser.c b/parser/parser.c index 6add999..739cc4c 100644 --- a/parser/parser.c +++ b/parser/parser.c @@ -516,10 +516,10 @@ static int parse_images(parsertype p, void *cfg, struct swupdate_cfg *swcfg, lua LIST_INSERT_HEAD(&swcfg->images, image, next); - TRACE("Found %sImage %s %s: %s in %s : %s for handler %s%s %s\n", + TRACE("Found %sImage%s%s%s%s: %s in %s : %s for handler %s%s%s\n", image->compressed ? "compressed " : "", - image->id.name, - image->id.version, + strlen(image->id.name) ? " " : "", image->id.name, + strlen(image->id.version) ? " " : "", image->id.version, image->fname, strlen(image->volname) ? "volume" : "device", strlen(image->volname) ? image->volname : @@ -585,15 +585,15 @@ static int parse_files(parsertype p, void *cfg, struct swupdate_cfg *swcfg, lua_ LIST_INSERT_HEAD(&swcfg->images, file, next); - TRACE("Found %sFile %s %s: %s --> %s (%s) %s\n", + TRACE("Found %sFile%s%s%s%s: %s --> %s (%s)%s\n", file->compressed ? "compressed " : "", - file->id.name, - file->id.version, + strlen(file->id.name) ? " " : "", file->id.name, + strlen(file->id.version) ? " " : "", file->id.version, file->fname, file->path, strlen(file->device) ? file->device : "ROOTFS", (strlen(file->id.name) && file->id.install_if_different) ? - "Version must be checked" : ""); + "; Version must be checked" : ""); } return 0;