Adjust check for rpm/deb archive type
This commit is contained in:
@@ -97,12 +97,14 @@ func HandleFile(ctx logContext.Context, reReader *diskbufferreader.DiskBufferRea
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
_, arReader, err := archiver.Identify("", reReader)
|
if !(mimeT == arMimeType || mimeT == rpmMimeType) {
|
||||||
if errors.Is(err, archiver.ErrNoMatch) {
|
_, _, err := archiver.Identify("", reReader)
|
||||||
return false
|
if errors.Is(err, archiver.ErrNoMatch) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
archiveChan, err := handler.HandleFile(ctx, arReader) // Delegate to the specific handler to process the file.
|
archiveChan, err := handler.HandleFile(ctx, reReader) // Delegate to the specific handler to process the file.
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.Logger().Error(err, "error handling file")
|
ctx.Logger().Error(err, "error handling file")
|
||||||
return false
|
return false
|
||||||
|
|||||||
@@ -36,15 +36,8 @@ func (h *RPMHandler) HandleFile(ctx logContext.Context, input io.Reader) (chan [
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
for {
|
if err := h.processRPMFiles(ctx, reader, archiveChan); err != nil {
|
||||||
select {
|
ctx.Logger().Error(err, "error processing RPM files")
|
||||||
case <-ctx.Done():
|
|
||||||
return
|
|
||||||
default:
|
|
||||||
if err := h.processRPMFiles(ctx, reader, archiveChan); err != nil {
|
|
||||||
ctx.Logger().Error(err, "error processing RPM files")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user