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:
Show replies by date