Changes to 'refs/tags/rhn-client-tools-1.6.4-1'
by Martin Minar
Tag 'rhn-client-tools-1.6.4-1' created by Martin Minar <mminar(a)redhat.com> at 2011-08-03 12:00 +0000
Tagging package [rhn-client-tools] version [1.6.4-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-java-1.6.10-1:
Martin Minar (1):
Automatic commit of package [rhn-client-tools] release [1.6.4-1].
Martin Osvald (1):
679846 - regenerate kickstart file after modifying kickstart scripts
Milan Zazrivec (1):
702107 - cogent error message for exception when listing child channels
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py | 7 ++++++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 2 ++
rel-eng/packages/rhn-client-tools | 2 +-
4 files changed, 14 insertions(+), 3 deletions(-)
---
12 years, 10 months
client/rhel rel-eng/packages
by Martin Minar
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit b1d4cc1e236ba09433d9e63bc2a7dbe131b8dcf7
Author: Martin Minar <mminar(a)redhat.com>
Date: Wed Aug 3 14:00:27 2011 +0200
Automatic commit of package [rhn-client-tools] release [1.6.4-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 2b98098..a7b5b31 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.6.3
+Version: 1.6.4
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -339,6 +339,10 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Wed Aug 03 2011 Martin Minar <mminar(a)redhat.com> 1.6.4-1
+- 702107 - cogent error message for exception when listing child channels
+ (mzazrivec(a)redhat.com)
+
* Tue Aug 02 2011 Martin Minar <mminar(a)redhat.com> 1.6.3-1
- 702084 - rhn-channel: meaningful message when wrong username / password
(mzazrivec(a)redhat.com)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 38ccb47..46167b3 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.6.3-1 client/rhel/rhn-client-tools/
+1.6.4-1 client/rhel/rhn-client-tools/
12 years, 10 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit f4958c357d1f98782422812e21c887d7c17ba20d
Author: Martin Osvald <mosvald(a)redhat.com>
Date: Wed Aug 3 12:27:54 2011 +0200
679846 - regenerate kickstart file after modifying kickstart scripts
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
index 5688419..a51ce45 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
@@ -348,6 +348,7 @@ public class ProfileHandler extends BaseHandler {
script.setKsdata(ksData);
ksData.addScript(script);
HibernateFactory.getSession().save(script);
+ KickstartFactory.saveKickstartData(ksData);
return script.getId().intValue();
}
@@ -382,6 +383,7 @@ public class ProfileHandler extends BaseHandler {
script.setKsdata(null);
ksData.getScripts().remove(script);
KickstartFactory.removeKickstartScript(script);
+ KickstartFactory.saveKickstartData(ksData);
return 1;
}
12 years, 10 months
client/rhel
by Milan Zazrivec
client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit f54af17a889ab9e5a56e34cc81787aede9f87ce6
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Aug 3 11:50:39 2011 +0200
702107 - cogent error message for exception when listing child channels
diff --git a/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py b/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
index 22a120a..bacb619 100644
--- a/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
+++ b/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
@@ -97,7 +97,12 @@ def get_available_channels(user, password):
system_id = re.sub('^ID-', '', rpclib.xmlrpclib.loads(up2dateAuth.getSystemId())[0][0]['system_id'])
result = []
- for channel in client.system.listChildChannels(key, int(system_id)):
+ try:
+ channels = client.system.listChildChannels(key, int(system_id))
+ except xmlrpclib.Fault, exc:
+ systemExit(1, "Error when listing child channels: %s" % exc.faultString)
+
+ for channel in channels:
if 'LABEL' in channel:
result.extend([channel['LABEL']])
else:
12 years, 10 months
Changes to 'refs/tags/spacewalk-java-1.6.10-1'
by Tomas Lestach
Tag 'spacewalk-java-1.6.10-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-08-03 08:33 +0000
Tagging package [spacewalk-java] version [1.6.10-1] in directory [java/].
Changes since spacewalk-backend-1.6.4-1:
Tomas Lestach (2):
adding @param tag
Automatic commit of package [spacewalk-java] release [1.6.10-1].
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 1 +
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 10 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c04a95992fa2ca10b41b32e6aabe48a4dcddca43
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 3 10:33:13 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.10-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 5d6528a..ed66613 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.9
+Version: 1.6.10
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Aug 03 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.10-1
+- adding @param tag (tlestach(a)redhat.com)
+
* Tue Aug 02 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.9-1
- 723528 - make templating flag for kickstart scripts accessible also for API
(tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index fee9064..f06920f 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.9-1 java/
+1.6.10-1 java/
12 years, 10 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 771b15d6122fea646da4766cbd76f142d6e6c6d7
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 3 10:29:49 2011 +0200
adding @param tag
checkstyle fix
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
index 387d4f6..5688419 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
@@ -309,6 +309,7 @@ public class ProfileHandler extends BaseHandler {
* @param interpreter the script interpreter to use
* @param type "pre" or "post"
* @param chroot true if you want it to be chrooted
+ * @param template enable templating using cobbler
* @return the id of the created script
*
* @xmlrpc.doc Add a pre/post script to a kickstart profile.
12 years, 10 months
Changes to 'refs/tags/spacewalk-backend-1.6.4-1'
by Šimon Lukašík
Tag 'spacewalk-backend-1.6.4-1' created by Simon Lukasik <slukasik(a)redhat.com> at 2011-08-02 22:27 +0000
Tagging package [spacewalk-backend] version [1.6.4-1] in directory [backend/].
Changes since spacewalk-java-1.6.9-1:
Simon Lukasik (5):
remove unused imports
701232 - remove unnecessary directories
extract method: unlink_package_file
In any case, do not attempt to remove /var/satellite
Automatic commit of package [spacewalk-backend] release [1.6.4-1].
---
backend/satellite_tools/spacewalk-data-fsck | 14 +++-----------
backend/satellite_tools/spacewalk-remove-channel | 6 ++----
backend/satellite_tools/spacewalk-update-signatures | 4 ----
backend/server/rhnPackage.py | 16 ++++++++++++++++
backend/spacewalk-backend.spec | 8 +++++++-
rel-eng/packages/spacewalk-backend | 2 +-
6 files changed, 29 insertions(+), 21 deletions(-)
---
12 years, 10 months
backend/spacewalk-backend.spec rel-eng/packages
by Šimon Lukašík
backend/spacewalk-backend.spec | 8 +++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 24d131390c81c337b096231577ff7dd7fdd64fb2
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Aug 3 00:27:23 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.6.4-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 76d22a6..d25aa15 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.6.3
+Version: 1.6.4
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -672,6 +672,12 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Aug 03 2011 Simon Lukasik <slukasik(a)redhat.com> 1.6.4-1
+- In any case, do not attempt to remove /var/satellite (slukasik(a)redhat.com)
+- extract method: unlink_package_file (slukasik(a)redhat.com)
+- 701232 - remove unnecessary directories (slukasik(a)redhat.com)
+- remove unused imports (slukasik(a)redhat.com)
+
* Tue Aug 02 2011 Simon Lukasik <slukasik(a)redhat.com> 1.6.3-1
- 673694 - process also child channels of custom channels (slukasik(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 03805a0..a4035a2 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.6.3-1 backend/
+1.6.4-1 backend/
12 years, 10 months
backend/server
by Šimon Lukašík
backend/server/rhnPackage.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 12c7f3d2b73b283d92b397e4e55b9c42656ee640
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Aug 2 23:43:52 2011 +0200
In any case, do not attempt to remove /var/satellite
diff --git a/backend/server/rhnPackage.py b/backend/server/rhnPackage.py
index d375f6d..3413a86 100644
--- a/backend/server/rhnPackage.py
+++ b/backend/server/rhnPackage.py
@@ -111,8 +111,8 @@ def unlink_package_file(path):
except OSError:
log_debug(1, "Error unlinking %s;" % path)
dirname = os.path.dirname(path)
- base_dir = CFG.MOUNT_POINT + '/' + CFG.PREPENDED_DIR
- while dirname != base_dir:
+ base_dirs = (CFG.MOUNT_POINT + '/' + CFG.PREPENDED_DIR, CFG.MOUNT_POINT)
+ while dirname not in base_dirs:
try:
os.rmdir(dirname)
except OSError, e:
12 years, 10 months