client/solaris
by Jan Pazdziora
client/solaris/smartpm/smart/backends/solaris/pm.py | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
New commits:
commit 23b4dc4de7760f2ecda937cd08b3283f4c12064b
Author: Pierre Casenove <pcasenove(a)gmail.com>
Date: Thu Nov 22 07:07:35 2012 +0000
838033 - Remove use of ZipFile object to avoid ZipFile 64 extension missing in python 2.4
diff --git a/client/solaris/smartpm/smart/backends/solaris/pm.py b/client/solaris/smartpm/smart/backends/solaris/pm.py
index defdf5e..3d99dae 100644
--- a/client/solaris/smartpm/smart/backends/solaris/pm.py
+++ b/client/solaris/smartpm/smart/backends/solaris/pm.py
@@ -66,15 +66,10 @@ def solinstall(adminfile, path, pkg, prog=None):
raise UnzipException("patch %s: unzip of %s into %s failed: %s" % \
(pkg.name, path, tdir, x))
- zf = zipfile.ZipFile(path)
- pd = zf.namelist()[0].split('/')[0]
- zf.close()
-# zf = os.path.basename(path)
-# pd = zf.rstrip(".zip")
+ pd= os.listdir(tdir)
+ pkgdir = os.path.join(tdir, pd[0])
- pkgdir = os.path.join(tdir, pd)
-
- if not os.path.isdir(pkgdir):
+ if len(pd) > 1:
raise UnzipException( \
"patch %s contained more than 1 directory: %s" % \
(pkg.name, pkgdir))
11 years, 6 months
Changes to 'refs/tags/spacewalk-java-1.9.16-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.9.16-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-22 16:22 +0000
Tagging package [spacewalk-java] version [1.9.16-1] in directory [java/].
Changes since osad-5.11.13-1:
Jan Pazdziora (2):
Fixing checkstyle.
Automatic commit of package [spacewalk-java] release [1.9.16-1].
---
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 1 -
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
---
11 years, 6 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 1 -
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit e88f77209520e3c2b905de79aac3c715d48b68a2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Nov 22 17:22:02 2012 +0100
Automatic commit of package [spacewalk-java] release [1.9.16-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index cf4268c..295b7f4 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.15
+Version: 1.9.16
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -617,6 +617,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Nov 22 2012 Jan Pazdziora 1.9.16-1
+- Fixing checkstyle.
+
* Thu Nov 22 2012 Jan Pazdziora 1.9.15-1
- 864037 - no hardcoding URLs.
- 879006 - Use default cobbler user id if not overriden
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index a22006b..e7a5837 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.15-1 java/
+1.9.16-1 java/
commit 111fdbbe6e2bc767ff7fcbfb2c42ee2d02b5bce7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Nov 22 17:21:38 2012 +0100
Fixing checkstyle.
Addressing
Starting audit...
/builddir/build/BUILD/spacewalk-java-1.9.15/./code/src/com/redhat/rhn/domain/kickstart/KickstartData.java:17:8: Unused import - com.redhat.rhn.common.conf.Config.
Audit done.
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index 6c56f74..26024fd 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -14,7 +14,6 @@
*/
package com.redhat.rhn.domain.kickstart;
-import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.hibernate.HibernateFactory;
import com.redhat.rhn.common.util.StringUtil;
11 years, 6 months
Changes to 'refs/tags/spacewalk-java-1.9.15-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.9.15-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-22 15:51 +0000
Tagging package [spacewalk-java] version [1.9.15-1] in directory [java/].
Changes since rhn-client-tools-1.9.5-1:
Jan Pazdziora (2):
864037 - no hardcoding URLs.
Automatic commit of package [spacewalk-java] release [1.9.15-1].
Johannes Renner (1):
Fix errors with unrequired field 'Prefix'
Milan Zazrivec (4):
always commit the update
877451 - honor yum's "proxy = _none_" settings
877451 - add missing and
877451 - correct parsing of main and channel's settings
Stephen Herr (1):
879006 - Use default cobbler user id if not overriden
---
backend/satellite_tools/repo_plugins/yum_src.py | 4 +++-
client/tools/osad/src/dispatcher_client.py | 3 +--
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 2 +-
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 2 +-
java/code/src/com/redhat/rhn/frontend/action/user/UserEditActionHelper.java | 3 ++-
java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java | 8 ++++++--
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
8 files changed, 21 insertions(+), 10 deletions(-)
---
11 years, 6 months
Changes to 'refs/tags/spacewalk-backend-1.9.9-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.9.9-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-22 15:51 +0000
Tagging package [spacewalk-backend] version [1.9.9-1] in directory [backend/].
Changes since rhn-client-tools-1.9.5-1:
Jan Pazdziora (3):
864037 - no hardcoding URLs.
Automatic commit of package [spacewalk-java] release [1.9.15-1].
Automatic commit of package [spacewalk-backend] release [1.9.9-1].
Johannes Renner (1):
Fix errors with unrequired field 'Prefix'
Milan Zazrivec (4):
always commit the update
877451 - honor yum's "proxy = _none_" settings
877451 - add missing and
877451 - correct parsing of main and channel's settings
Stephen Herr (1):
879006 - Use default cobbler user id if not overriden
---
backend/satellite_tools/repo_plugins/yum_src.py | 4 +++-
backend/spacewalk-backend.spec | 7 ++++++-
client/tools/osad/src/dispatcher_client.py | 3 +--
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 2 +-
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 2 +-
java/code/src/com/redhat/rhn/frontend/action/user/UserEditActionHelper.java | 3 ++-
java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java | 8 ++++++--
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/packages/spacewalk-java | 2 +-
10 files changed, 28 insertions(+), 12 deletions(-)
---
11 years, 6 months
Changes to 'refs/tags/osad-5.11.13-1'
by Jan Pazdziora
Tag 'osad-5.11.13-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-22 15:51 +0000
Tagging package [osad] version [5.11.13-1] in directory [client/tools/osad/].
Changes since rhn-client-tools-1.9.5-1:
Jan Pazdziora (4):
864037 - no hardcoding URLs.
Automatic commit of package [spacewalk-java] release [1.9.15-1].
Automatic commit of package [spacewalk-backend] release [1.9.9-1].
Automatic commit of package [osad] release [5.11.13-1].
Johannes Renner (1):
Fix errors with unrequired field 'Prefix'
Milan Zazrivec (4):
always commit the update
877451 - honor yum's "proxy = _none_" settings
877451 - add missing and
877451 - correct parsing of main and channel's settings
Stephen Herr (1):
879006 - Use default cobbler user id if not overriden
---
backend/satellite_tools/repo_plugins/yum_src.py | 4 +++-
backend/spacewalk-backend.spec | 7 ++++++-
client/tools/osad/osad.spec | 5 ++++-
client/tools/osad/src/dispatcher_client.py | 3 +--
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 2 +-
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 2 +-
java/code/src/com/redhat/rhn/frontend/action/user/UserEditActionHelper.java | 3 ++-
java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java | 8 ++++++--
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/osad | 2 +-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/packages/spacewalk-java | 2 +-
12 files changed, 33 insertions(+), 14 deletions(-)
---
11 years, 6 months
3 commits - backend/spacewalk-backend.spec client/tools java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 7 ++++++-
client/tools/osad/osad.spec | 5 ++++-
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/osad | 2 +-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/packages/spacewalk-java | 2 +-
6 files changed, 19 insertions(+), 6 deletions(-)
New commits:
commit aed897b2cf9e8e2a99b3237fcab30f88eb5355b8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Nov 22 16:51:32 2012 +0100
Automatic commit of package [osad] release [5.11.13-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 37f72a8..57014b7 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -16,7 +16,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.11.12
+Version: 5.11.13
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -345,6 +345,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Thu Nov 22 2012 Jan Pazdziora 5.11.13-1
+- always commit the update
+
* Tue Nov 13 2012 Jan Pazdziora 5.11.12-1
- Fixing the definition of the pid file.
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index 09398d9..13283d5 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.11.12-1 client/tools/osad/
+5.11.13-1 client/tools/osad/
commit d5656b6a5f486cac097a14e2028024f530210ce7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Nov 22 16:51:20 2012 +0100
Automatic commit of package [spacewalk-backend] release [1.9.9-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 587dde2..f770262 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.8
+Version: 1.9.9
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -637,6 +637,11 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Nov 22 2012 Jan Pazdziora 1.9.9-1
+- 877451 - correct parsing of main and channel's settings
+- 877451 - add missing and
+- 877451 - honor yum's "proxy = _none_" settings
+
* Fri Nov 16 2012 Jan Pazdziora 1.9.8-1
- 877451 - yum-like per-repo configuration for spacewalk-repo-sync
- remove misleading comment
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index e0393d8..ecd88a8 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.9.8-1 backend/
+1.9.9-1 backend/
commit 8221633cc290fdafc6cc293abf607fc096cf4d4e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Nov 22 16:51:14 2012 +0100
Automatic commit of package [spacewalk-java] release [1.9.15-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 05afb4e..cf4268c 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.14
+Version: 1.9.15
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -617,6 +617,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Nov 22 2012 Jan Pazdziora 1.9.15-1
+- 864037 - no hardcoding URLs.
+- 879006 - Use default cobbler user id if not overriden
+- Fix errors with unrequired field 'Prefix'
+
* Wed Nov 21 2012 Jan Pazdziora 1.9.14-1
- decrease distChannelMap release minimal length
- No need to put empty lines to rhn_taskomatic_daemon.log.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index a779798..a22006b 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.14-1 java/
+1.9.15-1 java/
11 years, 6 months
backend/satellite_tools
by Milan Zazrivec
backend/satellite_tools/repo_plugins/yum_src.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 8b1bd32ad08ca31d6f4ccce98fc57567cf28fa46
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Nov 22 16:14:27 2012 +0100
877451 - correct parsing of main and channel's settings
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py b/backend/satellite_tools/repo_plugins/yum_src.py
index 70068b5..481ecf9 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -130,8 +130,9 @@ class ContentSource(object):
fileutils.makedirs(pkgdir, user='apache', group='apache')
repo.pkgdir = pkgdir
- if not (repo.cfg.has_option(self.name, 'proxy') or repo.cfg.has_option('main', 'proxy')) \
- and self.proxy_addr is not None:
+ if ((repo.cfg.has_section(self.name) and not repo.cfg.has_option(self.name, 'proxy')) or
+ (repo.cfg.has_section('main') and not repo.cfg.has_option('main', 'proxy'))) and \
+ self.proxy_addr is not None:
repo.proxy = "http://%s" % self.proxy_addr
repo.proxy_username = self.proxy_user
repo.proxy_password = self.proxy_pass
11 years, 6 months
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6f2380996391a75d6175e385a634370d10da35cc
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Nov 22 09:01:06 2012 +0100
864037 - no hardcoding URLs.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
index 788600f..8a8d97c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
@@ -366,7 +366,7 @@ public class DownloadFile extends DownloadAction {
}
// Send data
- URL url = new URL("http://localhost:25151/cobbler_api");
+ URL url = new URL(ConfigDefaults.get().getCobblerServerUrl());
URLConnection conn = url.openConnection();
conn.setDoOutput(true);
OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
11 years, 6 months
java/code
by StephenHerr
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7df41de3a470351c4fbbbe411e31a8a4026235a0
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Nov 21 14:26:24 2012 -0500
879006 - Use default cobbler user id if not overriden
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index c9f007e..6c56f74 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -1305,7 +1305,7 @@ public class KickstartData {
if (getCobblerId() != null) {
Profile prof = Profile.lookupById(
CobblerXMLRPCHelper.getConnection(
- Config.get().getString(ConfigDefaults.COBBLER_AUTOMATED_USER)),
+ ConfigDefaults.get().getCobblerAutomatedUser()),
getCobblerId());
if (prof != null && !StringUtils.isBlank(prof.getKickstart())) {
return prof.getKickstart();
11 years, 6 months