/[smeserver]/rpms/smeserver-yum/sme8/smeserver-yum-2.2.0-import-keys.patch
ViewVC logotype

Annotation of /rpms/smeserver-yum/sme8/smeserver-yum-2.2.0-import-keys.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Wed Oct 14 11:20:46 2009 UTC (15 years ago) by filippocarletti
Branch: MAIN
CVS Tags: smeserver-yum-2_2_0-14_el5_sme, smeserver-yum-2_2_0-24_el5_sme, smeserver-yum-2_2_0-22_el5_sme, smeserver-yum-2_2_0-16_el5_sme, smeserver-yum-2_2_0-26_el5_sme, smeserver-yum-2_2_0-18_el5_sme, smeserver-yum-2_2_0-12_el5_sme, smeserver-yum-2_2_0-17_el5_sme, smeserver-yum-2_2_0-20_el5_sme, smeserver-yum-2_2_0-23_el5_sme, smeserver-yum-2_2_0-13_el5_sme, smeserver-yum-2_2_0-15_el5_sme, smeserver-yum-2_2_0-19_el5_sme, smeserver-yum-2_2_0-11_el5_sme, smeserver-yum-2_2_0-21_el5_sme, smeserver-yum-2_2_0-25_el5_sme, HEAD
* Wed Oct 14 2009 Filipo Carletti <filippo.carletti@gmail.com> 2.2.0-11.sme
- Import only keys not already imported [SME: 5507]

1 filippocarletti 1.1 diff -up smeserver-yum-2.2.0/root/etc/e-smith/events/actions/yum-import-keys.import-keys smeserver-yum-2.2.0/root/etc/e-smith/events/actions/yum-import-keys
2     --- smeserver-yum-2.2.0/root/etc/e-smith/events/actions/yum-import-keys.import-keys 2008-10-07 16:25:45.000000000 +0200
3     +++ smeserver-yum-2.2.0/root/etc/e-smith/events/actions/yum-import-keys 2009-10-14 13:06:49.000000000 +0200
4     @@ -37,7 +37,11 @@ sub parse_key {
5     next;
6     }
7    
8     - return $key if m#END PGP PUBLIC KEY BLOCK#;
9     + if (m#END PGP PUBLIC KEY BLOCK#) {
10     + $key .= $1 if (m/^(.+)-----END PGP PUBLIC KEY BLOCK/);
11     + return $key;
12     + }
13     +
14    
15     $key .= $_ if m#^\S+$# && $good;
16     }

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed