java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 6 +++
java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp | 17 +++++++---
2 files changed, 18 insertions(+), 5 deletions(-)
New commits:
commit 89404dabbcc81190562d6b540d2256467cc1f46a
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Dec 21 16:11:46 2012 +0100
set child channel checksum type to parent's
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
index b9d5dce..d404441 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
@@ -639,6 +639,12 @@ public class EditChannelAction extends RhnAction implements Listable {
}
ctx.getRequest().setAttribute("parentChannelArches", parentChannelArches);
+ HashMap parentChannelChecksums = new HashMap();
+ for (Channel c : bases) {
+ parentChannelChecksums.put(c.getId(), c.getChecksumTypeLabel());
+ }
+ ctx.getRequest().setAttribute("parentChannelChecksums", parentChannelChecksums);
+
// base channel arches
List channelArches = new ArrayList();
List<ChannelArch> arches = ChannelManager.getChannelArchitectures();
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
index ae3391f..3356638 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
@@ -7,12 +7,19 @@
<body>
<script type="text/javascript">
-function setChildChannelArch() {
-var baseChannels = {};
+function setChildChannelArchChecksum() {
+var baseChannelArches = {};
<c:forEach items="${parentChannelArches}" var="parentChannel">
-baseChannels["<c:out value="${parentChannel.key}" />"] = "<c:out value="${parentChannel.value}"/>";
+baseChannelArches["<c:out value="${parentChannel.key}" />"] = "<c:out value="${parentChannel.value}"/>";
</c:forEach>
-document.getElementById("parentarch").value = baseChannels[document.getElementById("parent").value];
+
+var baseChannelChecksums = {};
+<c:forEach items="${parentChannelChecksums}" var="parentChannel">
+baseChannelChecksums["<c:out value="${parentChannel.key}" />"] = "<c:out value="${parentChannel.value}"/>";
+</c:forEach>
+
+document.getElementById("parentarch").value = baseChannelArches[document.getElementById("parent").value];
+document.getElementById("checksum").value = baseChannelChecksums[document.getElementById("parent").value];
}
</script>
@@ -70,7 +77,7 @@ document.getElementById("parentarch").value = baseChannels[document.getElementBy
<c:choose>
<c:when test='${empty param.cid}'>
<html:select property="parent" styleId="parent"
- onchange="setChildChannelArch()">
+ onchange="setChildChannelArchChecksum()">
<html:options collection="parentChannels"
property="value"
labelProperty="label" />
10 years, 5 months
java/code schema/spacewalk
by Milan Zazrivec
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml | 2 +-
schema/spacewalk/common/data/rhnTimezone.sql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/005-rhnTimezone.sql | 3 +++
18 files changed, 20 insertions(+), 17 deletions(-)
New commits:
commit 0fe0d655a44177b83bcfa83bd4909381e4481242
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Dec 21 11:04:26 2012 +0100
889463 - correct olson name for Australia Western timezone
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml
index 9a2a16f..0fe2286 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml
@@ -130,7 +130,7 @@
</context-group>
<target>(GMT+০৯০০) জাপান</target>
</trans-unit>
- <trans-unit id="Asia/Hong_Kong">
+ <trans-unit id="Australia/Perth">
<source>(GMT+0800) Australia (Western)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml
index 4af64cd..d1fc005 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml
@@ -130,7 +130,7 @@
</context-group>
<target>(GMT+0900) Japan</target>
</trans-unit>
- <trans-unit id="Asia/Hong_Kong">
+ <trans-unit id="Australia/Perth">
<source>(GMT+0800) Australia (Western)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml
index 5d2513a..0312614 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml
@@ -116,7 +116,7 @@
<context context-type="sourcefile">/rhn/account/UserDetails</context>
</context-group>
</trans-unit>
- <trans-unit id="Asia/Hong_Kong">
+ <trans-unit id="Australia/Perth">
<source>(GMT+0800) Australia (Western)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml
index 059d08a..604a7ad 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml
@@ -130,7 +130,7 @@
</context-group>
<target>(GMT+0900) Japón</target>
</trans-unit>
- <trans-unit id="Asia/Hong_Kong">
+ <trans-unit id="Australia/Perth">
<source>(GMT+0800) Australia (Western)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml
index 069f339..112b240 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml
@@ -130,7 +130,7 @@
</context-group>
<target>(GMT+0900) Japon</target>
</trans-unit>
- <trans-unit id="Asia/Hong_Kong">
+ <trans-unit id="Australia/Perth">
<source>(GMT+0800) Australia (Western)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml
index ac1ac45..3ae7127 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml
@@ -130,7 +130,7 @@
</context-group>
<target>(GMT+0900) જાપાન</target>
</trans-unit>
- <trans-unit id="Asia/Hong_Kong">
+ <trans-unit id="Australia/Perth">
<source>(GMT+0800) Australia (Western)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml
index 71ccdd4..f18ddaf 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml
@@ -130,7 +130,7 @@
</context-group>
<target>(GMT+0900) जापान</target>
</trans-unit>
- <trans-unit id="Asia/Hong_Kong">
+ <trans-unit id="Australia/Perth">
<source>(GMT+0800) Australia (Western)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml
index 7ff803a..b5142e7 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml
@@ -130,7 +130,7 @@
</context-group>
<target>(GMT+0900) Giappone</target>
</trans-unit>
- <trans-unit id="Asia/Hong_Kong">
+ <trans-unit id="Australia/Perth">
<source>(GMT+0800) Australia (Western)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml
index ce7f565..dba0880 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml
@@ -130,7 +130,7 @@
</context-group>
<target>(GMT+0900) 日本</target>
</trans-unit>
- <trans-unit id="Asia/Hong_Kong">
+ <trans-unit id="Australia/Perth">
<source>(GMT+0800) Australia (Western)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml
index a4ae46e..62a4aab 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml
@@ -130,7 +130,7 @@
</context-group>
<target>(GMT+0900) 일본</target>
</trans-unit>
- <trans-unit id="Asia/Hong_Kong">
+ <trans-unit id="Australia/Perth">
<source>(GMT+0800) Australia (Western)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml
index 8c94f0f..39c5702 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml
@@ -130,7 +130,7 @@
</context-group>
<target>(GMT+0900) ਜਪਾਨ</target>
</trans-unit>
- <trans-unit id="Asia/Hong_Kong">
+ <trans-unit id="Australia/Perth">
<source>(GMT+0800) Australia (Western)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml
index 69c1949..ed22229 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml
@@ -130,7 +130,7 @@
</context-group>
<target>(GMT+0900) Japão</target>
</trans-unit>
- <trans-unit id="Asia/Hong_Kong">
+ <trans-unit id="Australia/Perth">
<source>(GMT+0800) Australia (Western)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml
index 9c9ef27..0d488d1 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml
@@ -130,7 +130,7 @@
</context-group>
<target>(GMT+0900) Япония</target>
</trans-unit>
- <trans-unit id="Asia/Hong_Kong">
+ <trans-unit id="Australia/Perth">
<source>(GMT+0800) Australia (Western)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml
index 3e2962f..0efdc69 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml
@@ -130,7 +130,7 @@
</context-group>
<target>(GMT+0900) ஜப்பான்</target>
</trans-unit>
- <trans-unit id="Asia/Hong_Kong">
+ <trans-unit id="Australia/Perth">
<source>(GMT+0800) Australia (Western)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml
index 4f7da33..3d726b8 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml
@@ -130,7 +130,7 @@
</context-group>
<target>(GMT+0900)日本</target>
</trans-unit>
- <trans-unit id="Asia/Hong_Kong">
+ <trans-unit id="Australia/Perth">
<source>(GMT+0800) Australia (Western)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml
index b1a93b5..cb4365e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml
@@ -130,7 +130,7 @@
</context-group>
<target>(GMT+0900) 日本</target>
</trans-unit>
- <trans-unit id="Asia/Hong_Kong">
+ <trans-unit id="Australia/Perth">
<source>(GMT+0800) Australia (Western)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
diff --git a/schema/spacewalk/common/data/rhnTimezone.sql b/schema/spacewalk/common/data/rhnTimezone.sql
index 0bd8455..2a70465 100644
--- a/schema/spacewalk/common/data/rhnTimezone.sql
+++ b/schema/spacewalk/common/data/rhnTimezone.sql
@@ -39,7 +39,7 @@ insert into rhnTimezone
(id, olson_name, display_name)
values
(sequence_nextval('rhn_timezone_id_seq'),
- 'Asia/Hong_Kong', 'Australia (Western)');
+ 'Australia/Perth', 'Australia (Western)');
insert into rhnTimezone
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/005-rhnTimezone.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/005-rhnTimezone.sql
new file mode 100644
index 0000000..7e2d97f
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/005-rhnTimezone.sql
@@ -0,0 +1,3 @@
+update rhnTimezone
+ set olson_name = 'Australia/Perth'
+ where olson_name = 'Asia/Hong_Kong' and display_name = 'Australia (Western)';
10 years, 5 months
Changes to 'refs/tags/spacewalk-utils-1.9.8-1'
by Jan Pazdziora
Tag 'spacewalk-utils-1.9.8-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-12-21 08:49 +0000
Tagging package [spacewalk-utils] version [1.9.8-1] in directory [utils/].
Changes since spacewalk-utils-1.9.7-1:
Jan Pazdziora (2):
Silencing pylint warnings.
Automatic commit of package [spacewalk-utils] release [1.9.8-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/cloneByDate.py | 4 +++-
utils/spacewalk-utils.spec | 5 ++++-
3 files changed, 8 insertions(+), 3 deletions(-)
---
10 years, 5 months
2 commits - rel-eng/packages utils/cloneByDate.py utils/spacewalk-utils.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-utils | 2 +-
utils/cloneByDate.py | 4 +++-
utils/spacewalk-utils.spec | 5 ++++-
3 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit e3636a818d2ddf5d457b5fc84c6c432275b87997
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 21 09:49:11 2012 +0100
Automatic commit of package [spacewalk-utils] release [1.9.8-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index 9dd1215..a1c4200 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.9.7-1 utils/
+1.9.8-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index e0ac0d5..330ef23 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 1.9.7
+Version: 1.9.8
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -86,6 +86,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Fri Dec 21 2012 Jan Pazdziora 1.9.8-1
+- Silencing pylint warnings.
+
* Fri Dec 21 2012 Jan Pazdziora 1.9.7-1
- We cannot have except and finally in the same try block for python 2.4.
commit ba85ec659d8b7d65a73cf5fec51cbea2109f5414
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 21 09:23:51 2012 +0100
Silencing pylint warnings.
Addressing
************* Module cloneByDate
C0301:720: Line too long (136/120)
W0631:350:ChannelTreeCloner.dep_solve: Using possibly undefined loop variable 'repo'
diff --git a/utils/cloneByDate.py b/utils/cloneByDate.py
index 91c8288..d59e7ec 100644
--- a/utils/cloneByDate.py
+++ b/utils/cloneByDate.py
@@ -337,6 +337,7 @@ class ChannelTreeCloner:
# dep solver expects the metadata to be in /repodata directory;
# create temporary symlinks
temp_repo_links = []
+ repo = None
for repo in repos:
yum_repodata_path = "%s/repodata" % (repo['relative_path'])
create_repodata_link(repo['relative_path'], yum_repodata_path)
@@ -718,7 +719,8 @@ class UserError(Exception):
class UserRepoError(UserError):
def __init__(self, label, yum_error=None):
- msg = "Unable to read repository information.\nPlease verify repodata has been generated in /var/cache/rhn/repodata/%s." % label
+ msg = "Unable to read repository information.\n" \
+ + "Please verify repodata has been generated in /var/cache/rhn/repodata/%s." % label
if yum_error:
msg += "\nError from yum: %s" % yum_error
UserError.__init__(self, msg)
10 years, 5 months
Changes to 'refs/tags/spacewalk-utils-1.9.7-1'
by Jan Pazdziora
Tag 'spacewalk-utils-1.9.7-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-12-21 08:13 +0000
Tagging package [spacewalk-utils] version [1.9.7-1] in directory [utils/].
Changes since spacewalk-utils-1.9.6-1:
Jan Pazdziora (2):
We cannot have except and finally in the same try block for python 2.4.
Automatic commit of package [spacewalk-utils] release [1.9.7-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/cloneByDate.py | 13 +++++++------
utils/spacewalk-utils.spec | 5 ++++-
3 files changed, 12 insertions(+), 8 deletions(-)
---
10 years, 5 months
2 commits - rel-eng/packages utils/cloneByDate.py utils/spacewalk-utils.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-utils | 2 +-
utils/cloneByDate.py | 13 +++++++------
utils/spacewalk-utils.spec | 5 ++++-
3 files changed, 12 insertions(+), 8 deletions(-)
New commits:
commit 6180e112e4fb9fde96dcd6c4d45d5816065f3da7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 21 09:13:26 2012 +0100
Automatic commit of package [spacewalk-utils] release [1.9.7-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index cd9a407..9dd1215 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.9.6-1 utils/
+1.9.7-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index e8e7e86..e0ac0d5 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 1.9.6
+Version: 1.9.7
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -86,6 +86,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Fri Dec 21 2012 Jan Pazdziora 1.9.7-1
+- We cannot have except and finally in the same try block for python 2.4.
+
* Fri Dec 21 2012 Jan Pazdziora 1.9.6-1
- 889317 - fix short-sighted problem in previous patch
- 889317 - make sure the user passes two channels to spacewalk-clone-by-date
commit f46cb8a10ae2279f780ffef6c67d9758d3b982e9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 21 09:12:30 2012 +0100
We cannot have except and finally in the same try block for python 2.4.
Addressing
File "/builddir/build/BUILD/spacewalk-utils-1.9.6/cloneByDate.py", line 351
finally:
^
SyntaxError: invalid syntax
diff --git a/utils/cloneByDate.py b/utils/cloneByDate.py
index beb425b..91c8288 100644
--- a/utils/cloneByDate.py
+++ b/utils/cloneByDate.py
@@ -342,12 +342,13 @@ class ChannelTreeCloner:
create_repodata_link(repo['relative_path'], yum_repodata_path)
temp_repo_links.append(yum_repodata_path)
try:
- solver = DepSolver(repos, nvrea_list)
- dep_results = solver.processResults(solver.getDependencylist())
- solver.cleanup()
- self.process_deps(dep_results)
- except RepoError, e:
- raise UserRepoError(repo["id"], e.value)
+ try:
+ solver = DepSolver(repos, nvrea_list)
+ dep_results = solver.processResults(solver.getDependencylist())
+ solver.cleanup()
+ self.process_deps(dep_results)
+ except RepoError, e:
+ raise UserRepoError(repo["id"], e.value)
finally:
# clean up temporary symlinks
for link in temp_repo_links:
10 years, 5 months
Changes to 'refs/tags/spacewalk-utils-1.9.6-1'
by Jan Pazdziora
Tag 'spacewalk-utils-1.9.6-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-12-21 07:38 +0000
Tagging package [spacewalk-utils] version [1.9.6-1] in directory [utils/].
Changes since spacewalk-schema-1.9.9-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-utils] release [1.9.6-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 12 +++++++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
---
10 years, 5 months
Changes to 'refs/tags/spacewalk-schema-1.9.9-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.9.9-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-12-21 07:37 +0000
Tagging package [spacewalk-schema] version [1.9.9-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-1.9.32-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-schema] release [1.9.9-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
10 years, 5 months
Changes to 'refs/tags/spacewalk-java-1.9.32-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.9.32-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-12-21 07:37 +0000
Tagging package [spacewalk-java] version [1.9.32-1] in directory [java/].
Changes since spacewalk-java-1.9.31-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.9.32-1].
Mark Huth (1):
889247 - support for Australia EST/EDT timezones
Stephen Herr (6):
870794 - don't create the clone channel if we're gonna error out due to lack of repodata
885782 - strip whitespace from spacewalk-clone-by-date conf file
889317 - migrate spacewalk-clone-by-date to argparse to avoid optparse bug
Revert "889317 - migrate spacewalk-clone-by-date to argparse to avoid optparse bug"
889317 - make sure the user passes two channels to spacewalk-clone-by-date
889317 - fix short-sighted problem in previous patch
Tomas Lestach (1):
update dwr dependencies since we expect dwr3
---
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml | 8
java/spacewalk-java.spec | 10
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/common/data/rhnTimezone.sql | 9
schema/spacewalk/upgrade/spacewalk-schema-1.8-to-spacewalk-schema-1.9/004-rhnTimezone.sql | 9
utils/cloneByDate.py | 370 +++++-----
utils/spacewalk-clone-by-date | 63 -
7 files changed, 259 insertions(+), 212 deletions(-)
---
10 years, 5 months
3 commits - java/spacewalk-java.spec rel-eng/packages schema/spacewalk utils/spacewalk-utils.spec
by Jan Pazdziora
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
rel-eng/packages/spacewalk-schema | 2 +-
rel-eng/packages/spacewalk-utils | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
utils/spacewalk-utils.spec | 12 +++++++++++-
6 files changed, 23 insertions(+), 6 deletions(-)
New commits:
commit c9e9a6e85387430d5da8378b1c93473641d168f4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 21 08:38:05 2012 +0100
Automatic commit of package [spacewalk-utils] release [1.9.6-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index 2601d90..cd9a407 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.9.5-1 utils/
+1.9.6-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index ccf9e2a..e8e7e86 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 1.9.5
+Version: 1.9.6
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -86,6 +86,16 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Fri Dec 21 2012 Jan Pazdziora 1.9.6-1
+- 889317 - fix short-sighted problem in previous patch
+- 889317 - make sure the user passes two channels to spacewalk-clone-by-date
+- Revert "889317 - migrate spacewalk-clone-by-date to argparse to avoid
+ optparse bug"
+- 889317 - migrate spacewalk-clone-by-date to argparse to avoid optparse bug
+- 885782 - strip whitespace from spacewalk-clone-by-date conf file
+- 870794 - don't create the clone channel if we're gonna error out due to lack
+ of repodata
+
* Wed Dec 05 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.9.5-1
- 866930 - do not traceback when called without --to_date
commit 73904953fbafccf971f9d32cbd80035302172211
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 21 08:37:56 2012 +0100
Automatic commit of package [spacewalk-schema] release [1.9.9-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 69ac19e..b639bf6 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.9.8-1 schema/spacewalk/
+1.9.9-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 1803a8d..15bdf72 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.9.8
+Version: 1.9.9
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri Dec 21 2012 Jan Pazdziora 1.9.9-1
+- 889247 - support for Australia EST/EDT timezones
+
* Fri Nov 30 2012 Jan Pazdziora 1.9.8-1
- New timezones for RHEL 7
- New installation type: RHEL 7
commit bf3b668eb0a66f1e70ce0352c3aac3f43be9378a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 21 08:37:44 2012 +0100
Automatic commit of package [spacewalk-java] release [1.9.32-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index a799620..b27d0b4 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.31
+Version: 1.9.32
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -659,6 +659,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Dec 21 2012 Jan Pazdziora 1.9.32-1
+- 889247 - support for Australia EST/EDT timezones
+- update dwr dependencies since we expect dwr3
+
* Tue Dec 18 2012 Tomas Lestach <tlestach(a)redhat.com> 1.9.31-1
- remove strange unused code
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 94fdc77..e639652 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.31-1 java/
+1.9.32-1 java/
10 years, 5 months