client/rhel
by Šimon Lukašík
client/rhel/rhnlib/test/24-ssl-memleak.py | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 85b34266a1d15b3d003c04845485ee14b4ab0a50
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Apr 8 12:46:19 2010 +0200
Added support for cmd-line arguments
diff --git a/client/rhel/rhnlib/test/24-ssl-memleak.py b/client/rhel/rhnlib/test/24-ssl-memleak.py
old mode 100644
new mode 100755
index 7d62ca0..387c740
--- a/client/rhel/rhnlib/test/24-ssl-memleak.py
+++ b/client/rhel/rhnlib/test/24-ssl-memleak.py
@@ -1,6 +1,8 @@
#!/usr/bin/python
#
# $Id$
+#
+# USAGE: $0 SERVER CERT
"""
Tests a memory leak in the applet
"""
@@ -10,8 +12,14 @@ import string
from rhn import rpclib
def main():
- server_url = "https://xmlrpc.rhn.webqa.redhat.com/APPLET"
+ server_name = "xmlrpc.rhn.redhat.com"
ca_cert = "/usr/share/rhn/RHNS-CA-CERT"
+ try:
+ server_name = sys.argv[1]
+ ca_cert = sys.argv[2]
+ except:
+ pass
+ server_url = "https://" + server_name + "/APPLET"
diff_count = 0
mem_usage = None
14 years, 1 month
client/rhel
by Šimon Lukašík
client/rhel/rhnlib/test/25-ssl-memleak.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 0332dbf3e9180005789b78a351c8a0407d2197b4
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Apr 8 11:56:01 2010 +0200
Added support for cmd-line arguments
diff --git a/client/rhel/rhnlib/test/25-ssl-memleak.py b/client/rhel/rhnlib/test/25-ssl-memleak.py
index 1a30ee1..f30dc2f 100644
--- a/client/rhel/rhnlib/test/25-ssl-memleak.py
+++ b/client/rhel/rhnlib/test/25-ssl-memleak.py
@@ -11,11 +11,18 @@ import socket
from rhn import SSL
def main():
- server_name = "xmlrpc.rhn.webqa.redhat.com"
+ server_name = "xmlrpc.rhn.redhat.com"
server_port = 443
ca_cert = "/usr/share/rhn/RHNS-CA-CERT"
+ try:
+ server_name = sys.argv[1]
+ server_port = int(sys.argv[2])
+ ca_cert = sys.argv[3]
+ except:
+ pass
diff_count = 0
+
mem_usage = None
for i in range(10000):
run_test(server_name, server_port, ca_cert)
14 years, 1 month
Changes to 'refs/tags/rhn-client-tools-1.0.0-1'
by Jan Pazdziora
Tag 'rhn-client-tools-1.0.0-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-04-08 09:37 +0000
Tagging package [rhn-client-tools] version [1.0.0-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-backend-0.9.19-1:
Jan Pazdziora (1):
Automatic commit of package [rhn-client-tools] release [1.0.0-1].
Tomas Lestach (1):
580227 - displaying dates in the same format
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++-
java/code/src/com/redhat/rhn/common/localization/LocalizationService.java | 16 ++++++++++
java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDetailsAction.java | 3 +
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 4 --
java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp | 2 -
rel-eng/packages/rhn-client-tools | 2 -
6 files changed, 26 insertions(+), 6 deletions(-)
---
14 years, 1 month
client/rhel rel-eng/packages
by Jan Pazdziora
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 559015c51f7ed1738563ba2b0be0cea7cddfa88b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Apr 8 11:37:25 2010 +0200
Automatic commit of package [rhn-client-tools] release [1.0.0-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 45edadf..5e668c7 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: 0.9.13
+Version: 1.0.0
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -238,6 +238,9 @@ make -f Makefile.rhn-client-tools test
%{_datadir}/applications/rhn_register.desktop
%changelog
+* Thu Apr 08 2010 Jan Pazdziora 1.0.0-1
+- Bumping up version to 1.0.0.
+
* Fri Apr 02 2010 Jan Pazdziora 0.9.13-1
- Fixes to previous cleanup.
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 39519e7..e5f2cd6 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-0.9.13-1 client/rhel/rhn-client-tools/
+1.0.0-1 client/rhel/rhn-client-tools/
14 years, 1 month
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/localization/LocalizationService.java | 16 ++++++++++
java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDetailsAction.java | 3 +
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 4 --
java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp | 2 -
4 files changed, 21 insertions(+), 4 deletions(-)
New commits:
commit 3c434176a55e6015d18ade5ab1301540e02ec246
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 7 23:02:23 2010 +0200
580227 - displaying dates in the same format
using time zone the user has set in locale preferencies
and displaying (kind of original) custom date format
diff --git a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
index 0fbe392..30b87d7 100644
--- a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
+++ b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java
@@ -28,6 +28,7 @@ import org.apache.log4j.Logger;
import java.text.Collator;
import java.text.DateFormat;
import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
@@ -59,6 +60,7 @@ public class LocalizationService {
* into java.util.Dates so they can be formatted based on Locale.
*/
public static final String RHN_DB_DATEFORMAT = "yyyy-MM-dd HH:mm:ss";
+ public static final String RHN_CUSTOM_DATEFORMAT = "yyyy-MM-dd HH:mm:ss z";
private static Logger log = Logger.getLogger(LocalizationService.class);
private static Logger msgLogger = Logger
@@ -433,6 +435,20 @@ public class LocalizationService {
}
/**
+ * Returns fixed custom format string displayed for the determined timezone
+ * Example: 2010-04-01 15:04:24 CEST
+ *
+ * @param date Date to format.
+ * @return String representation of given date for set timezone
+ */
+ public String formatCustomDate(Date date) {
+ TimeZone tz = determineTimeZone();
+ SimpleDateFormat sdf = new SimpleDateFormat(RHN_CUSTOM_DATEFORMAT);
+ sdf.setTimeZone(tz);
+ return sdf.format(date);
+ }
+
+ /**
* Format the Number based on the locale and convert it to a String to
* display.
* @param numberIn Number to format.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDetailsAction.java
index ac34c32..fd4978e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDetailsAction.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.action.channel;
+import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.channel.ChannelFactory;
import com.redhat.rhn.domain.role.RoleFactory;
@@ -81,6 +82,8 @@ public class ChannelDetailsAction extends RhnAction {
request.setAttribute("pack_size", ChannelFactory.getPackageCount(chan));
request.setAttribute("globally", chan.isGloballySubscribable(user.getOrg()));
request.setAttribute("channel", chan);
+ request.setAttribute("channel_last_modified", LocalizationService.
+ getInstance().formatCustomDate(chan.getLastModified()));
//Check if the channel needed repodata,
// if so get the status and last build info
if (chan.isChannelRepodataRequired()) {
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index 66a51ee..466088d 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -2782,9 +2782,7 @@ public class ChannelManager extends BaseManager {
// the file Modified date should be getting set when the file
// is moved into the correct location.
log.info("File Modified Date:" + fileModifiedDateIn);
- DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
- String fileModifiedDate = formatter.format(fileModifiedDateIn);
- return fileModifiedDate;
+ return LocalizationService.getInstance().formatCustomDate(fileModifiedDateIn);
}
diff --git a/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp b/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp
index b4038cd..d484c92 100644
--- a/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp
@@ -83,7 +83,7 @@
</tr>
<tr>
<th><bean:message key="channelfiles.jsp.lastmod"/>:</th>
- <td><c:out value="${channel.lastModified}" /></td>
+ <td><c:out value="${channel_last_modified}" /></td>
</tr>
<tr>
<th><bean:message key="channel.jsp.repolastbuild"/>:</th>
14 years, 1 month
Changes to 'refs/tags/spacewalk-backend-0.9.19-1'
by Michael Mraka
Tag 'spacewalk-backend-0.9.19-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-04-07 20:35 +0000
Tagging package [spacewalk-backend] version [0.9.19-1] in directory [backend/].
Changes since spacewalk-java-0.9.17-1:
Michael Mraka (9):
fixed DeprecationWarning: BaseException.message has been deprecated as of Python 2.6
574334 - fixed Error: NameError caught!
we should parse arglist not sys.argv
don't call python script from python code via shell
fix of create_isos() in previous commmit made iss_runcommand.py redundant
fill option list in once
conditions could be nice english sentences
removed commented out code
Automatic commit of package [spacewalk-backend] release [0.9.19-1].
---
backend/satellite_tools/disk_dumper/Makefile | 2
backend/satellite_tools/disk_dumper/iss_isos.py | 40 ++-----
backend/satellite_tools/disk_dumper/iss_runcommand.py | 91 ------------------
backend/satellite_tools/geniso.py | 2
backend/satellite_tools/satCerts.py | 4
backend/spacewalk-backend.spec | 6 -
rel-eng/packages/spacewalk-backend | 2
7 files changed, 20 insertions(+), 127 deletions(-)
---
14 years, 1 month
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 31b630847a9e2d39dcc3fe912730d4b7ed24703f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Apr 7 22:35:10 2010 +0200
Automatic commit of package [spacewalk-backend] release [0.9.19-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index ae33733..434062f 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.9.18
+Version: 0.9.19
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -629,6 +629,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Apr 07 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.19-1
+- 574334 - fixed Error: NameError caught!
+
* Wed Mar 31 2010 Partha Aji <paji(a)redhat.com> 0.9.18-1
- 575867 - Fixed a registration issue where config channels
in reactivation key + activation key combination got ranked
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 14bb39a..d7c1e8f 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.9.18-1 backend/
+0.9.19-1 backend/
14 years, 1 month
8 commits - backend/satellite_tools backend/spacewalk-backend.spec
by Michael Mraka
backend/satellite_tools/disk_dumper/Makefile | 2
backend/satellite_tools/disk_dumper/iss_isos.py | 40 ++-----
backend/satellite_tools/disk_dumper/iss_runcommand.py | 91 ------------------
backend/satellite_tools/geniso.py | 2
backend/satellite_tools/satCerts.py | 4
backend/spacewalk-backend.spec | 1
6 files changed, 15 insertions(+), 125 deletions(-)
New commits:
commit 7a44c1fa569615e560efdf28514c062eb850ff36
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Apr 7 22:33:17 2010 +0200
removed commented out code
diff --git a/backend/satellite_tools/disk_dumper/iss_isos.py b/backend/satellite_tools/disk_dumper/iss_isos.py
index 11eb412..c01ac49 100644
--- a/backend/satellite_tools/disk_dumper/iss_isos.py
+++ b/backend/satellite_tools/disk_dumper/iss_isos.py
@@ -28,8 +28,5 @@ def create_isos(mountpoint, outdir, prefix, lower_limit=None, upper_limit=None,
if copy_iso_dir is not None:
opts.append("--copy-iso-dir=%s" % copy_iso_dir)
- #if not upper_limit is None:
- # opts.append("-r%s" % upper_limit)
-
geniso.main(opts)
commit a0303fe8599bd84bf19806a41f539abd23603800
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Apr 7 22:31:27 2010 +0200
conditions could be nice english sentences
diff --git a/backend/satellite_tools/disk_dumper/iss_isos.py b/backend/satellite_tools/disk_dumper/iss_isos.py
index 9b4a069..11eb412 100644
--- a/backend/satellite_tools/disk_dumper/iss_isos.py
+++ b/backend/satellite_tools/disk_dumper/iss_isos.py
@@ -22,10 +22,10 @@ def create_isos(mountpoint, outdir, prefix, lower_limit=None, upper_limit=None,
"--type=%s" % iso_type,
]
- if not lower_limit is None:
+ if lower_limit is not None:
opts.append("-v%s-%s" % (lower_limit, upper_limit))
- if not copy_iso_dir is None:
+ if copy_iso_dir is not None:
opts.append("--copy-iso-dir=%s" % copy_iso_dir)
#if not upper_limit is None:
commit 9905a6a985873cb4abe0658c2246e9702a7c1fc7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Apr 7 22:30:23 2010 +0200
fill option list in once
diff --git a/backend/satellite_tools/disk_dumper/iss_isos.py b/backend/satellite_tools/disk_dumper/iss_isos.py
index 5c9cb69..9b4a069 100644
--- a/backend/satellite_tools/disk_dumper/iss_isos.py
+++ b/backend/satellite_tools/disk_dumper/iss_isos.py
@@ -16,14 +16,12 @@
from satellite_tools import geniso
def create_isos(mountpoint, outdir, prefix, lower_limit=None, upper_limit=None, copy_iso_dir=None, iso_type=None):
- opts = []
-
- opts.append("--mountpoint=%s" % mountpoint)
- opts.append("--file-prefix=%s" % prefix)
- opts.append("--output=%s" % outdir)
- opts.append("--type=%s" % iso_type)
-
-
+ opts = [ "--mountpoint=%s" % mountpoint,
+ "--file-prefix=%s" % prefix,
+ "--output=%s" % outdir,
+ "--type=%s" % iso_type,
+ ]
+
if not lower_limit is None:
opts.append("-v%s-%s" % (lower_limit, upper_limit))
commit 44488dbc5a1ae82e61b761048ecac9e715c60ac8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Apr 7 22:20:41 2010 +0200
fix of create_isos() in previous commmit made iss_runcommand.py redundant
removing...
diff --git a/backend/satellite_tools/disk_dumper/Makefile b/backend/satellite_tools/disk_dumper/Makefile
index 45f42b1..efbf32c 100644
--- a/backend/satellite_tools/disk_dumper/Makefile
+++ b/backend/satellite_tools/disk_dumper/Makefile
@@ -21,7 +21,7 @@ TOP = ../..
# Specific stuff
SUBDIR = satellite_tools/disk_dumper
-FILES = __init__ iss iss_isos iss_ui iss_actions iss_runcommand dumper string_buffer
+FILES = __init__ iss iss_isos iss_ui iss_actions dumper string_buffer
SCRIPTS = rhn-satellite-exporter
BINDIR = /usr/bin
include $(TOP)/Makefile.defs
diff --git a/backend/satellite_tools/disk_dumper/iss_runcommand.py b/backend/satellite_tools/disk_dumper/iss_runcommand.py
deleted file mode 100644
index bc417e7..0000000
--- a/backend/satellite_tools/disk_dumper/iss_runcommand.py
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# Copyright (c) 2008--2010 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-import os
-import subprocess
-import fcntl
-import select
-import sys
-import StringIO
-import types
-
-# Adapted from the Python Cookbook recipe called
-# "Capturing the Output and Error Streams from a
-# Unix Shell Command."
-
-def make_fd_nonblocking(file_desc):
- flags = fcntl.fcntl(file_desc, fcntl.F_GETFL)
-
- try:
- fcntl.fcntl(file_desc, fcntl.F_SETFL, flags | os.O_NDELAY)
- except AttributeError:
- fcntl.fcntl(file_desc, fcntl.F_SETFL, flags | fcntl.FNDELAY)
-
-def run_command(command):
- command_process = subprocess.Popen(command, stdin=subprocess.PIPE,
- stdout=subprocess.PIPE, stderr=subprocess.PIPE,
- close_fds=True, shell=(not (type(command) in (types.ListType, types.TupleType))) )
- outstring = StringIO.StringIO()
- errstring = StringIO.StringIO()
-
- command_process.stdin.close() # Don't need input to command_process.
- outfile = command_process.stdout
- outfile_fd = outfile.fileno()
- errfile = command_process.stderr
- errfile_fd = errfile.fileno()
-
- make_fd_nonblocking(outfile_fd)
- make_fd_nonblocking(errfile_fd)
-
- outdata, errdata = [], []
- out_eof = err_eof = False
-
- while True:
- to_check = [outfile_fd] * (not out_eof) + [errfile_fd] * (not err_eof)
- ready = select.select(to_check, [], [])
-
- if outfile_fd in ready[0]:
- outchunk = outfile.read()
- if outchunk == '':
- out_eof = True
- else:
- sys.stdout.write(outchunk)
- outstring.write(outchunk)
-
- if errfile_fd in ready[0]:
- errchunk = errfile.read()
- if errchunk == '':
- err_eof = True
- else:
- sys.stderr.write(errchunk)
- errstring.write(errchunk)
-
- if out_eof and err_eof:
- break
-
- select.select([], [], [], .1)
-
- status = command_process.wait()
- outval = outstring.getvalue()
- errval = errstring.getvalue()
- outstring.close()
- errstring.close()
- return status, outval, errval
-
-if __name__ == "__main__":
- status = run_command("ls -l")
- print status
-
-
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index c6e519f..ae33733 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -587,7 +587,6 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/satellite_tools/disk_dumper/iss.py*
%{rhnroot}/satellite_tools/disk_dumper/iss_ui.py*
%{rhnroot}/satellite_tools/disk_dumper/iss_isos.py*
-%{rhnroot}/satellite_tools/disk_dumper/iss_runcommand.py*
%{rhnroot}/satellite_tools/disk_dumper/iss_actions.py*
%{rhnroot}/satellite_tools/disk_dumper/dumper.py*
%{rhnroot}/satellite_tools/disk_dumper/string_buffer.py*
commit 70a2545b9720ff5fddeaccf8def44aa1a8d36441
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Apr 7 22:16:01 2010 +0200
don't call python script from python code via shell
diff --git a/backend/satellite_tools/disk_dumper/iss_isos.py b/backend/satellite_tools/disk_dumper/iss_isos.py
index a810c5f..5c9cb69 100644
--- a/backend/satellite_tools/disk_dumper/iss_isos.py
+++ b/backend/satellite_tools/disk_dumper/iss_isos.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008-2010 Red Hat, Inc.
#
# This software is licensed to you under the GNU General Public License,
# version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -13,15 +13,10 @@
# in this software or its documentation.
#
-from iss_runcommand import run_command
-
-class IsoError(Exception):
- pass
-
+from satellite_tools import geniso
def create_isos(mountpoint, outdir, prefix, lower_limit=None, upper_limit=None, copy_iso_dir=None, iso_type=None):
opts = []
- command = "PYTHONPATH=/usr/share/rhn python /usr/share/rhn/satellite_tools/geniso.py %s"
opts.append("--mountpoint=%s" % mountpoint)
opts.append("--file-prefix=%s" % prefix)
@@ -38,13 +33,5 @@ def create_isos(mountpoint, outdir, prefix, lower_limit=None, upper_limit=None,
#if not upper_limit is None:
# opts.append("-r%s" % upper_limit)
- optstr = " ".join(opts)
+ geniso.main(opts)
- status, outval, errval = run_command(command % optstr)
- if status != 0:
- raise IsoError(outval, errval)
-
-
-
-
-
commit 0ab72c0e0dadd896bef493a02c87e669b9e2bc03
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Apr 7 20:04:01 2010 +0200
we should parse arglist not sys.argv
diff --git a/backend/satellite_tools/geniso.py b/backend/satellite_tools/geniso.py
index 6ef8202..be63c4e 100644
--- a/backend/satellite_tools/geniso.py
+++ b/backend/satellite_tools/geniso.py
@@ -49,7 +49,7 @@ def main(arglist):
this flag is optional, but can be set to spanning, non-spanning, or base.'),
]
parser = OptionParser(option_list=optionsTable)
- options, args = parser.parse_args()
+ options, args = parser.parse_args(arglist)
# Check to see if mkisofs is installed
if not os.path.exists('/usr/bin/mkisofs'):
commit 38ad72471ae7668551338148428eb6f5cf036aeb
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Apr 7 18:47:41 2010 +0200
574334 - fixed Error: NameError caught!
detailed errors while debugging code were
NameError: "global name 'cmd' is not defined"
and
NameError: "global name 'types' is not defined"
diff --git a/backend/satellite_tools/disk_dumper/iss_runcommand.py b/backend/satellite_tools/disk_dumper/iss_runcommand.py
index 4c92eae..bc417e7 100644
--- a/backend/satellite_tools/disk_dumper/iss_runcommand.py
+++ b/backend/satellite_tools/disk_dumper/iss_runcommand.py
@@ -19,7 +19,7 @@ import fcntl
import select
import sys
import StringIO
-
+import types
# Adapted from the Python Cookbook recipe called
# "Capturing the Output and Error Streams from a
@@ -36,7 +36,7 @@ def make_fd_nonblocking(file_desc):
def run_command(command):
command_process = subprocess.Popen(command, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
- close_fds=True, shell=(not (type(cmd) in (types.ListType, types.TupleType))) )
+ close_fds=True, shell=(not (type(command) in (types.ListType, types.TupleType))) )
outstring = StringIO.StringIO()
errstring = StringIO.StringIO()
commit 00372c956a50e9dcc78c075bbc040650ce83fb74
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Apr 7 14:29:27 2010 +0200
fixed DeprecationWarning: BaseException.message has been deprecated as of Python 2.6
diff --git a/backend/satellite_tools/satCerts.py b/backend/satellite_tools/satCerts.py
index 0ad4f5e..42ae4c0 100644
--- a/backend/satellite_tools/satCerts.py
+++ b/backend/satellite_tools/satCerts.py
@@ -41,9 +41,9 @@ class CertGenerationMismatchError(Exception):
class CertVersionMismatchError(Exception):
def __init__(self, old_version, new_version):
- self.message = "the versions of current and new certificate do not match, [%s] vs. [%s]" % (old_version, new_version)
+ self._message = "the versions of current and new certificate do not match, [%s] vs. [%s]" % (old_version, new_version)
def __str__(self):
- return self.message
+ return self._message
class NoFreeEntitlementsError(Exception):
def __init__(self, label, quantity):
14 years, 1 month
Changes to 'refs/tags/spacewalk-java-0.9.17-1'
by Tomas Lestach
Tag 'spacewalk-java-0.9.17-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2010-04-07 16:11 +0000
Tagging package [spacewalk-java] version [0.9.17-1] in directory [java/].
Changes since spacewalk-java-0.9.16-1:
Tomas Lestach (3):
introducing kickstart.cloneProfile API call
fixing checkstyle error
Automatic commit of package [spacewalk-java] release [0.9.17-1].
---
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageAction.java | 3
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.java | 35 ++++++++++
java/spacewalk-java.spec | 5 +
rel-eng/packages/spacewalk-java | 2
4 files changed, 42 insertions(+), 3 deletions(-)
---
14 years, 1 month
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 a9b33d5232ff5e667bbe9582773efc6cf5c72d9c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 7 18:11:05 2010 +0200
Automatic commit of package [spacewalk-java] release [0.9.17-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index dd189e8..2bf4240 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.9.16
+Version: 0.9.17
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -310,6 +310,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Apr 07 2010 Tomas Lestach <tlestach(a)redhat.com> 0.9.17-1
+- introducing kickstart.cloneProfile API call (tlestach(a)redhat.com)
+
* Wed Apr 07 2010 Justin Sherrill <jsherril(a)redhat.com> 0.9.16-1
- 573153 - improving performance of the systems group overview page
considerably (jsherril(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 314cd34..b9afa7a 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.9.16-1 java/
+0.9.17-1 java/
14 years, 1 month