client/rhel
by Šimon Lukašík
client/rhel/spacewalk-oscap/scap.py | 10 +++++++++-
client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 365a4b0135985795e16fee0122a3ed87e9afbbf1
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Nov 1 16:47:47 2012 +0100
872248: Enable new `oscap' features in spacewalk-openscap.
diff --git a/client/rhel/spacewalk-oscap/scap.py b/client/rhel/spacewalk-oscap/scap.py
index 01dba2c..10106fd 100644
--- a/client/rhel/spacewalk-oscap/scap.py
+++ b/client/rhel/spacewalk-oscap/scap.py
@@ -59,7 +59,15 @@ def _process_params(args, filename):
params = ['--results', filename]
errors = ''
if args:
- allowed_args = {'--profile': 1, '--skip-valid': 0}
+ allowed_args = {
+ '--profile': 1,
+ '--skip-valid': 0,
+ '--cpe-dict': 1,
+ '--cpe-dict2': 1,
+ '--fetch-remote-resources': 0,
+ '--datastream-id': 1,
+ '--xccdf-id': 1,
+ }
args = args.split(' ')
i = 0
while i < len(args):
diff --git a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
index f5cba56..0b6631b 100644
--- a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
+++ b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
@@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python-devel
BuildRequires: rhnlib
-Requires: openscap-utils >= 0.8.0
+Requires: openscap-utils >= 0.9.2
Requires: libxslt
Requires: rhnlib
Requires: rhn-check
10 years, 11 months
java/code
by Michael Mraka
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit be8aab5984c275add1b43666f0f024e8ac7d37b6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 1 16:52:27 2012 +0100
having html tag inside xml is not correct
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
index e7e0f56..7ed4155 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
@@ -4858,7 +4858,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target></target></trans-unit>
<trans-unit id="systemcurrency.jsp.score">
-<source>System<br/>Score</source>
+<source>Score</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/SystemCurrency.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
index 66d4a8d..ace4028 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
@@ -4860,7 +4860,7 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</
<target>Verbesserungen</target></trans-unit>
<trans-unit id="systemcurrency.jsp.score">
-<source>System<br/>Score</source>
+<source>Score</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/SystemCurrency.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 9c64076..f08f760 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -5256,7 +5256,7 @@ value for this entitlement, excluding the default organization's consumption.</s
</trans-unit>
<trans-unit id="systemcurrency.jsp.score">
-<source>System<br/>Score</source>
+<source>Score</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/SystemCurrency.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index 842f037..106a073 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -4858,7 +4858,7 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta
<target>Mejoras</target></trans-unit>
<trans-unit id="systemcurrency.jsp.score">
-<source>System<br/>Score</source>
+<source>Score</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/SystemCurrency.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
index 6b9d8f4..19e1ece 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
@@ -4859,7 +4859,7 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta
<target>Améliorations</target></trans-unit>
<trans-unit id="systemcurrency.jsp.score">
-<source>System<br/>Score</source>
+<source>Score</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/SystemCurrency.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
index 61b68c9..ef58b34 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
@@ -4858,7 +4858,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target></target></trans-unit>
<trans-unit id="systemcurrency.jsp.score">
-<source>System<br/>Score</source>
+<source>Score</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/SystemCurrency.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
index 1fa1437..d953f51 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
@@ -4858,7 +4858,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target></target></trans-unit>
<trans-unit id="systemcurrency.jsp.score">
-<source>System<br/>Score</source>
+<source>Score</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/SystemCurrency.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index 98edd22..2949388 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -4858,7 +4858,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target></target></trans-unit>
<trans-unit id="systemcurrency.jsp.score">
-<source>System<br/>Score</source>
+<source>Score</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/SystemCurrency.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
index 1efb0e0..e245be0 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
@@ -4852,7 +4852,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>拡張</target></trans-unit>
<trans-unit id="systemcurrency.jsp.score">
-<source>System<br/>Score</source>
+<source>Score</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/SystemCurrency.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
index d73f8b4..0f9f8c8 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
@@ -4857,7 +4857,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target></target></trans-unit>
<trans-unit id="systemcurrency.jsp.score">
-<source>System<br/>Score</source>
+<source>Score</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/SystemCurrency.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
index 75cf390..591e14f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
@@ -4858,7 +4858,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target></target></trans-unit>
<trans-unit id="systemcurrency.jsp.score">
-<source>System<br/>Score</source>
+<source>Score</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/SystemCurrency.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
index c8ddfad..0e98dd5 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
@@ -4856,7 +4856,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>Aprimoramentos</target></trans-unit>
<trans-unit id="systemcurrency.jsp.score">
-<source>System<br/>Score</source>
+<source>Score</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/SystemCurrency.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index d142db2..d0d5282 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -4855,7 +4855,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target></target></trans-unit>
<trans-unit id="systemcurrency.jsp.score">
-<source>System<br/>Score</source>
+<source>Score</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/SystemCurrency.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
index a01ac5a..ebf87dd 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
@@ -4858,7 +4858,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target></target></trans-unit>
<trans-unit id="systemcurrency.jsp.score">
-<source>System<br/>Score</source>
+<source>Score</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/SystemCurrency.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
index 3c14681..6c87a6e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
@@ -4858,7 +4858,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>增强</target></trans-unit>
<trans-unit id="systemcurrency.jsp.score">
-<source>System<br/>Score</source>
+<source>Score</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/SystemCurrency.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
index 1728d9b..0714459 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
@@ -4854,7 +4854,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target></target></trans-unit>
<trans-unit id="systemcurrency.jsp.score">
-<source>System<br/>Score</source>
+<source>Score</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/SystemCurrency.do</context>
</context-group>
10 years, 11 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/channel/manage/validation/distChannelMapForm.xsd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f726cf0f9e1bb9e66258337fe88ff0a762974b8b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Nov 1 16:11:29 2012 +0100
decrease distChannelMap release minimal length
as f.e. Fedora17 uses '17' by default
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/validation/distChannelMapForm.xsd b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/validation/distChannelMapForm.xsd
index d7608e4..5fad684 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/validation/distChannelMapForm.xsd
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/validation/distChannelMapForm.xsd
@@ -13,7 +13,7 @@
<attribute name="release">
<simpleType baseType="string">
- <minLength value="3" />
+ <minLength value="2" />
<maxLength value="64" />
</simpleType>
</attribute>
10 years, 11 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 1168f61a9d16b42b533a21513c8538529862e745
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Oct 31 15:05:27 2012 +0100
839960 - fix system.listLatestUpgradablePackages API to list upgradable packages from server channels only
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index d3a48c0..a71dfcf 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -867,6 +867,8 @@ ORDER BY UPPER(PN.name)
GROUP BY p.name_id) u
JOIN rhnPackageEvr e ON e.evr = u.max_evr
JOIN rhnPackage p ON p.name_id = u.name_id AND p.evr_id = e.id
+ JOIN rhnChannelPackage cp ON cp.package_id = p.id
+ JOIN rhnServerChannel sc ON sc.channel_id = cp.channel_id AND sc.server_id = :sid
JOIN rhnPackageArch a ON a.id = p.package_arch_id
) up,
rhnPackageUpgradeArchCompat puac
10 years, 11 months