Michael Mraka wrote:
% Michael Calmer wrote:
% % Hello,
% %
% % the attached patch set implements checking of signed metadata before
mirroring
% % with spacewalk-repo-sync.
% % This patch adds a checkbox in "Manage Repositories". If this checkbox is
% % checked, spacewalk-repo-sync expects, that the repo metadata are signed and
% % try to verify the signature with an installed gpg key. If a matching gpg
key
% % is not found and the new commandile parameter --non-interactive is given,
% % spacewalk-repo-sync abort with an error.
% % if --non-interactive is not given, spacewalk-repo-sync try to download the
key
% % file from the server, display the values and ask the user to accept the key.
% % If the user agree, the key is installed and the signature will be verified.
%
% Hi Michael,
%
% your second patch failed to apply on today's master HEAD (namely
% b9d72a78d8084df93c90cd365ca24b776306eb15).
%
% I tried to apply it on older base - from Mon 7 Mar 2011 when you sent
% the patches - to get rid of changes we made later. Unfortunately
% it failed to apply even there.
% Could you please rebase your patch to the lastest spacewalk master?
%
%
% $ git am
/tmp/0002-implement-metadata-signature-checking-for-repositori.patch
% Applying: implement metadata signature checking for repositories
% spacewalk.git/.git/rebase-apply/patch:68: trailing whitespace.
%
% spacewalk.git/.git/rebase-apply/patch:200: trailing whitespace.
%
% error: patch failed: backend/satellite_tools/repo_plugins/yum_src.py:16
Michael,
I'm trying apply 0002 patch manually and the error is
patching file backend/satellite_tools/repo_plugins/yum_src.py
Hunk #1 FAILED at 16.
Hunk #2 succeeded at 32 (offset -3 lines).
Hunk #3 succeeded at 64 (offset -3 lines).
Hunk #4 FAILED at 116.
In the hunk #1 there is
% diff --git a/backend/satellite_tools/repo_plugins/yum_src.py
b/backend/satellite_tools/repo_plugins/yum_src.py
% index 782d49d..3b52d0a 100644
% --- a/backend/satellite_tools/repo_plugins/yum_src.py
% +++ b/backend/satellite_tools/repo_plugins/yum_src.py
% @@ -16,10 +16,18 @@
% import yum
% import shutil
% import sys
% +import os
% from yum import config
% from yum.update_md import UpdateMetadata
% -from spacewalk.satellite_tools.reposync import ContentPackage
...
but there aren't lines 'from yum import config' and 'from yum.update_md import
UpdateMetadata' so you probably missed some older commit which is required by
your patch.
Similary hunk #4 starts with
@@ -106,3 +124,142 @@ class ContentSource:
um = UpdateMetadata()
um.add(self.repo, all=True)
return um.notices
which code is missing in spacewalk master.
Regards,
--
Michael Mráka
Satellite Engineering, Red Hat
_______________________________________________
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel
