Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 313003

Summary: [discovery] SiteVerifier does not consider composite repositories
Product: [Eclipse Project] Equinox Reporter: Jochen Krause <jkrause>
Component: p2Assignee: David Green <greensopinion>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P3 CC: david.dubrow, pascal, shawn.minto, steffen.pingel
Version: unspecifiedFlags: shawn.minto: review+
pascal: review+
Target Milestone: 3.6 RC2   
Hardware: All   
OS: All   
Whiteboard:
Attachments:
Description Flags
trivial patch steffen.pingel: iplog+, steffen.pingel: review+

Description Jochen Krause CLA 2010-05-15 06:38:21 EDT
SiteVerifier does only check the existence of content.jar, content.xml and site. xml. This means that composite repositories are not recognized as "verified sites". SiteVerifier needs also to check for compositeContent.jar and compositeContent.xml at the update site url.
Comment 1 David Green CLA 2010-05-17 16:58:14 EDT
Created attachment 168824 [details]
trivial patch
Comment 2 Steffen Pingel CLA 2010-05-17 19:00:13 EDT
Comment on attachment 168824 [details]
trivial patch

Thanks David. This change looks exactly right to me.
Comment 3 Steffen Pingel CLA 2010-05-17 19:09:35 EDT
Jochen, I am lowering the severity since there is an easy work around: If you create an (empty) site.xml file verification will work but P2 won't be affected since it prefers the composite repository.

Pascal, do we need an additional +1 for this change or can I go ahead an commit the patch?
Comment 4 Pascal Rapicault CLA 2010-05-17 19:52:38 EDT
two +1 are needed. I'll take a look.
Comment 5 Steffen Pingel CLA 2010-05-17 23:39:54 EDT
Patch released.
Comment 6 David Green CLA 2010-05-18 17:56:02 EDT
*** Bug 313004 has been marked as a duplicate of this bug. ***