java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java | 2 +-
java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java | 2 +-
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java | 2 +-
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java | 2 +-
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java | 2 +-
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf | 1 +
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf | 4 ++--
java/code/webapp/WEB-INF/struts-config.xml | 1 +
8 files changed, 9 insertions(+), 7 deletions(-)
New commits:
commit 949a2f3c846bbdda6fa7b7907bb792925a4abccf
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Nov 20 13:36:15 2012 +0100
Do not use <select>'s with the same names on one form.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java
index 4243b7c..2f9579e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java
@@ -612,7 +612,7 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction {
* sync in the kickstart profile
*/
cmd.setProfileType(form.getString(TARGET_PROFILE_TYPE));
- cmd.setServerProfileId((Long) form.get("targetProfile"));
+ cmd.setServerProfileId((Long) form.get("targetServerProfile"));
cmd.setProfileId((Long) form.get("targetProfile"));
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java
index 732a7f6..3f582d3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java
@@ -146,7 +146,7 @@ public class SsmKSScheduleAction extends RhnAction implements Listable {
}
com.setProfileType(dynaForm.getString(
ScheduleKickstartWizardAction.TARGET_PROFILE_TYPE));
- com.setServerProfileId((Long) dynaForm.get("targetProfile"));
+ com.setServerProfileId((Long) dynaForm.get("targetServerProfile"));
com.setPackageProfileId((Long) dynaForm.get("targetProfile"));
//do kernel params
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java
index 9af67bf..d07c31a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java
@@ -205,7 +205,7 @@ public class ScheduleKickstartWizardTest extends RhnMockStrutsTestCase {
addRequestParameter(RequestContext.SID, s.getId().toString());
addRequestParameter("targetProfileType",
KickstartScheduleCommand.TARGET_PROFILE_TYPE_SYSTEM);
- addRequestParameter("targetProfile", otherServer.getId().toString());
+ addRequestParameter("targetServerProfile", otherServer.getId().toString());
addRequestParameter("wizardStep", "third");
addRequestParameter("items_selected", k.getCobblerId().toString());
addRequestParameter("scheduleAsap", "false");
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java
index d43f3de..0d62ef2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java
@@ -184,7 +184,7 @@ public class ProvisionVirtualizationWizardAction extends ScheduleKickstartWizard
cmd.setKernelOptions(form.getString(KERNEL_PARAMS));
cmd.setProfileType(form.getString("targetProfileType"));
- cmd.setServerProfileId((Long) form.get("targetProfile"));
+ cmd.setServerProfileId((Long) form.get("targetServerProfile"));
cmd.setProfileId((Long) form.get("targetProfile"));
cmd.setGuestName(form.getString(GUEST_NAME));
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java
index de59d61..8547ed5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java
@@ -143,7 +143,7 @@ public class ProvisionVirtualizationWizardActionTest extends RhnMockStrutsTestCa
addRequestParameter(RequestContext.SID, s.getId().toString());
addRequestParameter("targetProfileType",
KickstartScheduleCommand.TARGET_PROFILE_TYPE_SYSTEM);
- addRequestParameter("targetProfile", otherServer.getId().toString());
+ addRequestParameter("targetServerProfile", otherServer.getId().toString());
addRequestParameter("wizardStep", "third");
addRequestParameter("items_selected", k.getCobblerId().toString());
addRequestParameter("scheduleAsap", "false");
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf
index 774094e..c364eac 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf
@@ -5,6 +5,7 @@
<!--Store form variables obtained from previous page -->
<input type="hidden" name="targetProfileType" value="${form.targetProfileType}"/>
<input type="hidden" name="targetProfile" value="${form.targetProfile}" />
+ <input type="hidden" name="targetServerProfile" value="${form.targetServerProfile}" />
<input type="hidden" name="postKernelParamsType" value="${form.postKernelParamsType}" />
<input type="hidden" name="postKernelParams" value="${form.postKernelParams}" />
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf
index 093d3d9..b6446ae 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf
@@ -44,12 +44,12 @@
/>
<bean:message key="kickstart.schedule.sync.pkg.profile.option3.jsp" />:
- <select name="targetProfile" id="syncSystemSelect"
+ <select name="targetServerProfile" id="syncSystemSelect"
<c:if test="${form.targetProfileType ne 'system' or empty form.syncSystems}">disabled="true"</c:if>
>
<c:forEach var="system" items="${form.syncSystems}">
<option
- <c:if test="${system.id == form.targetProfile}">selected="selected"</c:if>
+ <c:if test="${system.id == form.targetServerProfile}">selected="selected"</c:if>
value='${system.id}'>${system.name}</option>
</c:forEach>
</select>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index 0b44ba8..6793b48 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -841,6 +841,7 @@
<form-property name="postKernelParams" type="java.lang.String" />
<form-property name="targetProfileType" type="java.lang.String" />
<form-property name="targetProfile" type="java.lang.Long" />
+ <form-property name="targetServerProfile" type="java.lang.Long" />
<form-property name="syncPackages" type="java.util.List" />
<form-property name="syncSystems" type="java.util.List" />
<form-property name="date_year" type="java.lang.Integer" />
11 years, 4 months
Changes to 'refs/tags/spacewalk-java-1.9.29-1'
by Michael Mraka
Tag 'spacewalk-java-1.9.29-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-12-14 15:20 +0000
Tagging package [spacewalk-java] version [1.9.29-1] in directory [java/].
Changes since spacewalk-backend-1.9.14-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-java] release [1.9.29-1].
---
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
11 years, 4 months
java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 20639be9b4e08bb48d1a152c3603e21d3a9d64e1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 14 16:20:16 2012 +0100
Automatic commit of package [spacewalk-java] release [1.9.29-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 9c4a987..7dbabf5 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.28
+Version: 1.9.29
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -659,6 +659,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Dec 14 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.9.29-1
+- determining tomcat version when building webapp instead hardcode tomcat5
+
* Fri Dec 07 2012 Jan Pazdziora 1.9.28-1
- 883546 - reworking how repodata xml gets built to avoid "snapshot too old"
errors
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index c56f779..d869338 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.28-1 java/
+1.9.29-1 java/
11 years, 4 months
Changes to 'refs/tags/spacewalk-backend-1.9.14-1'
by Michael Mraka
Tag 'spacewalk-backend-1.9.14-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-12-14 15:15 +0000
Tagging package [spacewalk-backend] version [1.9.14-1] in directory [backend/].
Changes since spacewalk-proxy-1.9.2-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-backend] release [1.9.14-1].
---
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
11 years, 4 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 092afa0205355c467c5789c5566ac629db818155
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 14 16:15:23 2012 +0100
Automatic commit of package [spacewalk-backend] release [1.9.14-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index eabfc31..0edafb5 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.9.13
+Version: 1.9.14
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -637,6 +637,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Dec 14 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.9.14-1
+- Do not use value attribute of an exception
+
* Mon Dec 10 2012 Jan Pazdziora 1.9.13-1
- 885170 - fixing syntax.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 6f9a9de..628eb50 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.9.13-1 backend/
+1.9.14-1 backend/
11 years, 4 months
Changes to 'refs/tags/spacewalk-proxy-1.9.2-1'
by Michael Mraka
Tag 'spacewalk-proxy-1.9.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-12-14 15:14 +0000
Tagging package [spacewalk-proxy] version [1.9.2-1] in directory [proxy/proxy/].
Changes since rhnpush-5.5.57-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-proxy] release [1.9.2-1].
---
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
11 years, 4 months
proxy/proxy rel-eng/packages
by Michael Mraka
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 49957108353f0c4b030113d16378f9abe2396915
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 14 16:14:42 2012 +0100
Automatic commit of package [spacewalk-proxy] release [1.9.2-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index ef5484d..6e4d4ff 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.9.1
+Version: 1.9.2
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -330,6 +330,9 @@ fi
%changelog
+* Fri Dec 14 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.9.2-1
+- 873541 - switch back to /XP handler if /APP is not available
+
* Fri Nov 02 2012 Stephen Herr <sherr(a)redhat.com> 1.9.1-1
- 872721 - keep the proxy from trying to auth as 127.0.0.1
- Bumping package versions for 1.9.
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index d45abe9..099e876 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.9.1-1 proxy/proxy/
+1.9.2-1 proxy/proxy/
11 years, 4 months
Changes to 'refs/tags/rhnpush-5.5.57-1'
by Michael Mraka
Tag 'rhnpush-5.5.57-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-12-14 15:12 +0000
Tagging package [rhnpush] version [5.5.57-1] in directory [client/tools/rhnpush/].
Changes since spacewalk-oscap-0.0.13-1:
Michael Mraka (10):
873541 - make interface path configurable
873541 - switch back to /XP handler if /APP is not available
873541 - old interface uses password authentication
873541 - use old password calls with old interface
873541 - reuse _listChannel()
873541 - fixed imports
873541 - don't silently hide other errors
873541 - use old password calls with old interface
873541 - use old password calls with old interface
Automatic commit of package [rhnpush] release [5.5.57-1].
Milan Zazrivec (5):
use ip instead of ifconfig to get networking info
use ip instead of route to determine default gateway
typo fix
properly specify device for 'ip route' command
Do not use value attribute of an exception
Tomas Kasparek (1):
Determining tomcat version and using it when building webapp instead hardcode tomcat5
---
backend/satellite_tools/reposync.py | 2
client/tools/rhnpush/rhnpush.spec | 5 +
client/tools/rhnpush/uploadLib.py | 49 +++++++++++--
client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py | 14 +--
java/buildconf/build-webapp.xml | 20 +++--
proxy/proxy/pm/rhn_package_manager.py | 29 ++++++-
rel-eng/packages/rhnpush | 2
7 files changed, 90 insertions(+), 31 deletions(-)
---
11 years, 4 months
client/tools rel-eng/packages
by Michael Mraka
client/tools/rhnpush/rhnpush.spec | 5 ++++-
rel-eng/packages/rhnpush | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 282bd15d36babbed10421f6842a56a56bdfcc426
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 14 16:12:27 2012 +0100
Automatic commit of package [rhnpush] release [5.5.57-1].
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec
index 5349d02..5b2f2fe 100644
--- a/client/tools/rhnpush/rhnpush.spec
+++ b/client/tools/rhnpush/rhnpush.spec
@@ -4,7 +4,7 @@ Name: rhnpush
Group: Applications/System
License: GPLv2
URL: http://fedorahosted.org/spacewalk
-Version: 5.5.56
+Version: 5.5.57
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,6 +75,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%doc COPYING
%changelog
+* Fri Dec 14 2012 Michael Mraka <michael.mraka(a)redhat.com> 5.5.57-1
+- 873541 - switch back to /XP handler if /APP is not available
+
* Sun Nov 11 2012 Michael Calmer <mc(a)suse.de> 5.5.56-1
- package solaris converter for SUSE too
diff --git a/rel-eng/packages/rhnpush b/rel-eng/packages/rhnpush
index 5f291e6..061e7af 100644
--- a/rel-eng/packages/rhnpush
+++ b/rel-eng/packages/rhnpush
@@ -1 +1 @@
-5.5.56-1 client/tools/rhnpush/
+5.5.57-1 client/tools/rhnpush/
11 years, 4 months
9 commits - client/tools proxy/proxy
by Michael Mraka
client/tools/rhnpush/uploadLib.py | 49 +++++++++++++++++++++++++++++-----
proxy/proxy/pm/rhn_package_manager.py | 29 +++++++++++++++-----
2 files changed, 65 insertions(+), 13 deletions(-)
New commits:
commit 08bbd5a50e3ad4567a16027ff0797e655f0001cc
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 13 12:06:27 2012 +0100
873541 - use old password calls with old interface
diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploadLib.py
index 0295d52..affc8c9 100644
--- a/client/tools/rhnpush/uploadLib.py
+++ b/client/tools/rhnpush/uploadLib.py
@@ -310,13 +310,21 @@ class UploadClass:
l.sort()
self.files = l
+ def _listMissingSourcePackages(self):
+ if self.use_session:
+ return listMissingSourcePackagesBySession(self.server,
+ self.session.getSessionString(), self.channels)
+ else:
+ return listMissingSourcePackages(self.server,
+ self.username, self.password, self.channels)
+
def get_missing_source_packages(self):
localPackagesHash = {}
for filename in self.files:
localPackagesHash[os.path.basename(filename)] = filename
# Now get the list from the server
- pkglist = listMissingSourcePackagesBySession(self.server, self.session.getSessionString(), self.channels)
+ pkglist = self._listMissingSourcePackages()
to_push = []
for pkg in pkglist:
commit 2bfaa9dea887d74ae6a991f364aaa95277ef606a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 13 12:06:27 2012 +0100
873541 - use old password calls with old interface
diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploadLib.py
index c57fa93..0295d52 100644
--- a/client/tools/rhnpush/uploadLib.py
+++ b/client/tools/rhnpush/uploadLib.py
@@ -339,10 +339,20 @@ class UploadClass:
return self.files[:]
def _uploadSourcePackageInfo(self, info):
- return call(self.server.packages.uploadSourcePackageInfoBySession, self.session.getSessionString(), info)
+ if self.use_session:
+ return call(self.server.packages.uploadSourcePackageInfoBySession,
+ self.session.getSessionString(), info)
+ else:
+ return call(self.server.packages.uploadSourcePackageInfo,
+ self.username, self.password, info)
def _uploadPackageInfo(self, info):
- return call(self.server.packages.uploadPackageInfoBySession, self.session.getSessionString(), info)
+ if self.use_session:
+ return call(self.server.packages.uploadPackageInfoBySession,
+ self.session.getSessionString(), info)
+ else:
+ return call(self.server.packages.uploadPackageInfo,
+ self.username, self.password, info)
def uploadHeaders(self):
# Set the forcing factor
commit de5375f9a8e8d40734fecbfa32d6e05a92272209
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 13 14:06:43 2012 +0100
873541 - don't silently hide other errors
diff --git a/proxy/proxy/pm/rhn_package_manager.py b/proxy/proxy/pm/rhn_package_manager.py
index 7460eb9..12e8f8a 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -150,6 +150,8 @@ class UploadClass(uploadLib.UploadClass):
self.use_session = False
self.setURL('/XP')
uploadLib.UploadClass.setServer(self)
+ else:
+ raise
def authenticate(self):
if self.use_session:
commit 6678a85db57c833338f090ba09a6c11fc4473e36
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 13 14:05:05 2012 +0100
873541 - fixed imports
diff --git a/proxy/proxy/pm/rhn_package_manager.py b/proxy/proxy/pm/rhn_package_manager.py
index 26778c8..7460eb9 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -35,8 +35,9 @@ This script performs various management operations on the RHN proxy:
import os
import sys
import shutil
+import xmlrpclib
from operator import truth
-from rhnpush.uploadLib import UploadError, listChannelBySession
+from rhnpush.uploadLib import UploadError
from optparse import Option, OptionParser
# RHN imports
commit 3028069f6761c8512b4ba7842bf266fbeab6bfce
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 13 14:01:41 2012 +0100
873541 - reuse _listChannel()
to call correct method for channel listing
diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploadLib.py
index 01375c2..c57fa93 100644
--- a/client/tools/rhnpush/uploadLib.py
+++ b/client/tools/rhnpush/uploadLib.py
@@ -274,7 +274,7 @@ class UploadClass:
same_names_hash[nvrea] = filename
# Now get the list from the server
- pkglist = listChannelBySession(self.server, self.session.getSessionString(), self.channels)
+ pkglist = self._listChannel()
for p in pkglist:
name = p[0]
diff --git a/proxy/proxy/pm/rhn_package_manager.py b/proxy/proxy/pm/rhn_package_manager.py
index 18ced97..26778c8 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -185,9 +185,7 @@ class UploadClass(uploadLib.UploadClass):
self.authenticate()
# List the channel's contents
- channel_list = listChannelBySession(self.server,
- self.session.getSessionString(),
- self.channels)
+ channel_list = self._listChannel()
# Convert it to a hash of hashes
remotePackages = {}
commit eada165f11e8d2dc553227d9b26a794d26efbe59
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 13 12:06:27 2012 +0100
873541 - use old password calls with old interface
diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploadLib.py
index 10a3673..01375c2 100644
--- a/client/tools/rhnpush/uploadLib.py
+++ b/client/tools/rhnpush/uploadLib.py
@@ -175,10 +175,24 @@ class UploadClass:
self.files = self.files + readStdin()
def _listChannelSource(self):
- return listChannelSourceBySession(self.server, self.session.getSessionString(), self.channels)
+ if self.use_session:
+ return listChannelSourceBySession(self.server,
+ self.session.getSessionString(),
+ self.channels)
+ else:
+ return listChannelSource(self.server,
+ self.username, self.password,
+ self.channels)
def _listChannel(self):
- return listChannelBySession(self.server, self.session.getSessionString(), self.channels)
+ if self.use_session:
+ return listChannelBySession(self.server,
+ self.session.getSessionString(),
+ self.channels)
+ else:
+ return listChannel(self.server,
+ self.username, self.password,
+ self.channels)
def list(self):
# set the URL
commit b817b6d640c5df51c7dc23bff8e7c04b24457091
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 13 12:00:31 2012 +0100
873541 - old interface uses password authentication
diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploadLib.py
index de5ca1d..10a3673 100644
--- a/client/tools/rhnpush/uploadLib.py
+++ b/client/tools/rhnpush/uploadLib.py
@@ -73,6 +73,7 @@ class UploadClass:
self.session = None
self.orgId = None
self.relativeDir = None
+ self.use_session = True
def warn(self, verbose, *args):
if self.options.verbose >= verbose:
diff --git a/proxy/proxy/pm/rhn_package_manager.py b/proxy/proxy/pm/rhn_package_manager.py
index 4acc209..18ced97 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -146,9 +146,16 @@ class UploadClass(uploadLib.UploadClass):
uploadLib.call(self.server.packages.no_op, raise_protocol_error=True)
except xmlrpclib.ProtocolError, e:
if e.errcode == 404:
+ self.use_session = False
self.setURL('/XP')
uploadLib.UploadClass.setServer(self)
+ def authenticate(self):
+ if self.use_session:
+ uploadLib.UploadClass.authenticate(self)
+ else:
+ self.setUsernamePassword()
+
def setProxyUsernamePassword(self):
# overloaded for uploadlib.py
self.proxyUsername = CFG.HTTP_PROXY_USERNAME
commit aefc44ee26c254bdd1018af9c9d00cea75bd7e52
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 13 11:57:57 2012 +0100
873541 - switch back to /XP handler if /APP is not available
diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploadLib.py
index a21a764..de5ca1d 100644
--- a/client/tools/rhnpush/uploadLib.py
+++ b/client/tools/rhnpush/uploadLib.py
@@ -583,7 +583,7 @@ def listdir(directory):
return packagesList
-def call(function, *params):
+def call(function, *params, **kwargs):
# Wrapper function
try:
ret = function(*params)
@@ -595,6 +595,8 @@ def call(function, *params):
print x.faultExplanation
sys.exit(-1)
except xmlrpclib.ProtocolError, e:
+ if kwargs.get('raise_protocol_error'):
+ raise
print e.errmsg
sys.exit(-1)
diff --git a/proxy/proxy/pm/rhn_package_manager.py b/proxy/proxy/pm/rhn_package_manager.py
index 20be01a..4acc209 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -140,6 +140,15 @@ class UploadClass(uploadLib.UploadClass):
self.url = parseUrl(self.url)[1].split(':')[0]
self.url = scheme + self.url + path
+ def setServer(self):
+ try:
+ uploadLib.UploadClass.setServer(self)
+ uploadLib.call(self.server.packages.no_op, raise_protocol_error=True)
+ except xmlrpclib.ProtocolError, e:
+ if e.errcode == 404:
+ self.setURL('/XP')
+ uploadLib.UploadClass.setServer(self)
+
def setProxyUsernamePassword(self):
# overloaded for uploadlib.py
self.proxyUsername = CFG.HTTP_PROXY_USERNAME
commit 4bdd6238b91c7409aa2b59954933464929eec027
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 13 11:49:40 2012 +0100
873541 - make interface path configurable
diff --git a/proxy/proxy/pm/rhn_package_manager.py b/proxy/proxy/pm/rhn_package_manager.py
index 20f209c..20be01a 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -127,7 +127,7 @@ def main():
class UploadClass(uploadLib.UploadClass):
# pylint: disable=R0904
- def setURL(self):
+ def setURL(self, path = '/APP'):
# overloaded for uploadlib.py
if not CFG.RHN_PARENT:
self.die(-1, "rhn_parent not set in the configuration file")
@@ -138,7 +138,7 @@ class UploadClass(uploadLib.UploadClass):
scheme = 'https://'
self.url = CFG.RHN_PARENT or ''
self.url = parseUrl(self.url)[1].split(':')[0]
- self.url = scheme + self.url + '/APP'
+ self.url = scheme + self.url + path
def setProxyUsernamePassword(self):
# overloaded for uploadlib.py
11 years, 4 months