...Sometimes I really hate git. The patches all show up as applied in my
git log, no pending anything. I'm recloning and will try recommitting
again in just a few minutes.
- Maura Dailey
On 12/27/2013 03:29 PM, Shawn Wells wrote:
On 12/27/13, 1:04 PM, Maura Dailey wrote:
> My local copy reports that it's correctly looking at
> gconf.xml.mandatory for all 4 listed checks, git diff comes back
> clean, and I only have one pending patch that I know about (fixing up
> some missing service and package checks). If someone else could
> confirm that there's a problem, I could reclone everything and try
> again.
The checks are against gconf.xml.defaults within the upstream git
repo. Perhaps you have local patches/branches laying around?
https://git.fedorahosted.org/cgit/scap-security-guide.git/tree/RHEL/6/inp...
https://git.fedorahosted.org/cgit/scap-security-guide.git/tree/RHEL/6/inp...
https://git.fedorahosted.org/cgit/scap-security-guide.git/tree/RHEL/6/inp...
https://git.fedorahosted.org/cgit/scap-security-guide.git/tree/RHEL/6/inp...
>
> - Maura Dailey
>
> On 12/26/2013 02:07 PM, Shaw, Ray V CTR USARMY ARL (US) wrote:
>> Classification: UNCLASSIFIED
>> Caveats: NONE
>>
>> [Sorry for the delayed response, especially since I'm pretty sure I
>> opened the BZ; I've been stupidly busy at work.]
>>
>> The checks still seem to be looking at gconf.xml.defaults for:
>>
>> gconf_gnome_screensaver_idle_activation_enabled.xml
>> gconf_gnome_screensaver_idle_delay.xml
>> gconf_gnome_screensaver_lock_enabled.xml
>> gconf_gnome_screensaver_mode_blank.xml
>>
>> Did something go awry with part of this patch? I do see the commit
>> in the git log, and the "thumbnailers" check is looking at
>> gconf.xml.mandatory.