backend/spacewalk-backend.spec
by Miroslav Suchý
backend/spacewalk-backend.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 41e0febc7c0aa7e2908b592e7f8ca235dd8c14be
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jan 14 10:17:20 2013 +0100
fix bogus dates in changelog
follow up to e67a9cc118b8747b5001d5bf25e012c40916f38e
It is Tue, not Thu
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 49e24a2..aa30e15 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -3949,7 +3949,7 @@ rm -f %{rhnconf}/rhnSecret.py*
- siteConfig.py is now config(noreplace) since it was screwing up the
already-installed siteConfig.py
-* Thu Jul 10 2001 Todd Warner <taw(a)redhat.com>
+* Tue Jul 10 2001 Todd Warner <taw(a)redhat.com>
- /var/log/rhns --> /var/log/rhn to match rhnConfig.py
* Mon Jul 9 2001 Cristian Gafton <gafton(a)redhat.com>
11 years, 3 months
backend/spacewalk-backend.spec
by Miroslav Suchý
backend/spacewalk-backend.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit e67a9cc118b8747b5001d5bf25e012c40916f38e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jan 14 10:13:55 2013 +0100
fix bogus dates in changelog
http://koji.fedoraproject.org now checks for bogus dates in changelo
and build fails if dates are incorrect.
addressing:
RPM build errors:
error: Bad exit status from /var/tmp/rpm-tmp.NalB7J (%check)
bogus date in %changelog: Thu Dec 5 2008 Partha Aji <paji(a)redhat.com>
bogus date in %changelog: Wed Nov 18 2008 Partha Aji <paji(a)redhat.com>
bogus date in %changelog: Mon Jan 14 2003 Todd Warner <taw(a)redhat.com>
bogus date in %changelog: Mon Jul 10 2001 Todd Warner <taw(a)redhat.com>
Bad exit status from /var/tmp/rpm-tmp.NalB7J (%check)
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index a3cf76b..49e24a2 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -3629,10 +3629,10 @@ rm -f %{rhnconf}/rhnSecret.py*
* Mon Dec 8 2008 Michael Mraka <michael.mraka(a)redhat.com> 0.4.6-1
- fixed Obsoletes: rhns-* < 5.3.0
-* Thu Dec 5 2008 Partha Aji <paji(a)redhat.com>
+* Fri Dec 5 2008 Partha Aji <paji(a)redhat.com>
- Removed spacewalk-cobbler-sync & cobbler-spacewalk-sync from tools package
-* Wed Nov 18 2008 Partha Aji <paji(a)redhat.com>
+* Tue Nov 18 2008 Partha Aji <paji(a)redhat.com>
- Added spacewalk-cobbler-sync to tools package
* Mon Nov 17 2008 Devan Goodwin <dgoodwin(a)redhat.com> 0.4.5-1
@@ -3801,7 +3801,7 @@ rm -f %{rhnconf}/rhnSecret.py*
* Mon Jan 27 2003 Mihai Ibanescu <misa(a)redhat.com>
- Requires PyXML
-* Mon Jan 14 2003 Todd Warner <taw(a)redhat.com>
+* Tue Jan 14 2003 Todd Warner <taw(a)redhat.com>
- moved ownership of the /var/cache/rhn directory to the rhns-server rpm.
It's really a server/satellite thang.
- blow away the cache upon uninstallation.
@@ -3949,7 +3949,7 @@ rm -f %{rhnconf}/rhnSecret.py*
- siteConfig.py is now config(noreplace) since it was screwing up the
already-installed siteConfig.py
-* Mon Jul 10 2001 Todd Warner <taw(a)redhat.com>
+* Thu Jul 10 2001 Todd Warner <taw(a)redhat.com>
- /var/log/rhns --> /var/log/rhn to match rhnConfig.py
* Mon Jul 9 2001 Cristian Gafton <gafton(a)redhat.com>
11 years, 3 months
utils/spacewalk-clone-by-date
by StephenHerr
utils/spacewalk-clone-by-date | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
New commits:
commit c1e54e3ea1d085e1a1626dc978af8b2b27731cee
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Jan 11 11:02:53 2013 -0500
889317 - Removing now redundant validation check from spacewalk-clone-by-date
diff --git a/utils/spacewalk-clone-by-date b/utils/spacewalk-clone-by-date
index 9df9a55..0542e9d 100755
--- a/utils/spacewalk-clone-by-date
+++ b/utils/spacewalk-clone-by-date
@@ -165,7 +165,8 @@ def parse_args():
# have to check this option before we merge with the config file to
# ensure that optparse is parsing the args correctly. We have to
- # check it again after the config file merge.
+ # check it again after the config file merge to make sure we have
+ # channels.
if options.channels != None:
for channel_group in options.channels:
if (len(channel_group) != 2 or channel_group[0].startswith('-')
@@ -192,11 +193,6 @@ def parse_args():
if options.channels == None or len(options.channels) == 0:
raise UserError("No channels specified. See --help for details.")
- else:
- for channel_group in options.channels:
- for existing in channel_group.keys():
- if existing.startswith('-') or channel_group[existing].startswith('-'):
- raise UserError("The -l / --channels option requires two arguments")
if not options.username:
raise UserError("Username not specified")
11 years, 3 months
Changes to 'refs/tags/spacewalk-java-1.9.40-1'
by Tomas Lestach
Tag 'spacewalk-java-1.9.40-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-01-11 15:54 +0000
Tagging package [spacewalk-java] version [1.9.40-1] in directory [java/].
Changes since spacewalk-java-1.9.39-1:
Milan Zazrivec (1):
894356 - more informative spacewalk-schema-upgrade
Stephen Herr (3):
889317 - username check needs to happen after channel args length check
866930 - fixing exception if no date given and adding documentation
889317 - Add more thorough arg validation to spacewalk-clone-by-date
Tomas Lestach (4):
make the system.deleteSystems API doc more precise
fix typos
introduce new synchronous system.deleteSystem API
Automatic commit of package [spacewalk-java] release [1.9.40-1].
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 28 ++++++++--
java/spacewalk-java.spec | 7 ++
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/spacewalk-schema-upgrade | 22 +++++++
utils/cloneByDate.py | 2
utils/spacewalk-clone-by-date | 25 +++++++-
utils/spacewalk-clone-by-date.sgml | 2
7 files changed, 76 insertions(+), 12 deletions(-)
---
11 years, 3 months
4 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 28 ++++++++--
java/spacewalk-java.spec | 7 ++
rel-eng/packages/spacewalk-java | 2
3 files changed, 31 insertions(+), 6 deletions(-)
New commits:
commit 1503bde7a43dd46a46e3b48902e5a909f7ed5df7
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 11 16:54:09 2013 +0100
Automatic commit of package [spacewalk-java] release [1.9.40-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 31754d5..912d550 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.39
+Version: 1.9.40
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -659,6 +659,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Jan 11 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.40-1
+- introduce new synchronous system.deleteSystem API
+- fix typos
+- make the system.deleteSystems API doc more precise
+
* Wed Jan 09 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.39-1
- 868884 - fix the 'Replace Existing Subscriptions' SSM config channel option
- 868884 - subscribe only to selected config channels via SSM
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 0b5553f..5085f3f 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.39-1 java/
+1.9.40-1 java/
commit 2dc430f8854dfd84e07b50f44184508962d5d8b2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 11 14:45:15 2013 +0100
introduce new synchronous system.deleteSystem API
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index 102d0a2..4ebd5ec 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -1531,7 +1531,27 @@ public class SystemHandler extends BaseHandler {
return 1;
}
+ /**
+ * Delete a system given its server id synchronously
+ * @param sessionKey The sessionKey containing the logged in user
+ * @param serverId The id of the server in question
+ * @return 1 on success
+ * @throws FaultException A FaultException is thrown if:
+ * - The server corresponding to the sid cannot be found
+ * @xmlrpc.doc Delete a system given its server id synchronously
+ * @xmlrpc.param #param("string", "sessionKey")
+ * @xmlrpc.param #param("int", "serverId")
+ * @xmlrpc.returntype #return_int_success()
+ */
+ public int deleteSystem(String sessionKey, Integer serverId)
+ throws FaultException {
+ User loggedInUser = getLoggedInUser(sessionKey);
+ Server server = lookupServer(loggedInUser, serverId);
+
+ SystemManager.deleteServer(loggedInUser, server.getId());
+ return 1;
+ }
/**
* Get the addresses and hostname for a given server
commit addf8a669fa81ab817cee76d2af8d8e84c189af3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 11 14:43:22 2013 +0100
fix typos
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index 7755851..102d0a2 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -1487,7 +1487,7 @@ public class SystemHandler extends BaseHandler {
/**
- * Delete a system given its cilent certificate.
+ * Delete a system given its client certificate.
*
* @param clientCert client certificate of the system.
* @return 1 on success
@@ -1495,7 +1495,7 @@ public class SystemHandler extends BaseHandler {
* - The server corresponding to the sid cannot be found
* @throws MethodInvalidParamException thrown if certificate is invalid.
* @since 10.10
- * @xmlrpc.doc Delete a system given its cilent certificate.
+ * @xmlrpc.doc Delete a system given its client certificate.
* @xmlrpc.param #param_desc("string", "systemid", "systemid file")
* @xmlrpc.returntype #return_int_success()
*/
commit 31622fc3d1a59815f10f9d915858d98a54f4023b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 11 14:20:56 2013 +0100
make the system.deleteSystems API doc more precise
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index 2b11135..7755851 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -1429,7 +1429,7 @@ public class SystemHandler extends BaseHandler {
}
/**
- * Delete systems given a list of system ids.
+ * Delete systems given a list of system ids asynchronously.
* This call queues the systems for deletion
* @param sessionKey The sessionKey containing the logged in user
* @param systemIds A list of systems ids to delete
@@ -1438,7 +1438,7 @@ public class SystemHandler extends BaseHandler {
* @throws FaultException A FaultException is thrown if the server corresponding to
* sid cannot be found.
*
- * @xmlrpc.doc Delete systems given a list of system ids.
+ * @xmlrpc.doc Delete systems given a list of system ids asynchronously.
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.param #array_single("int", "serverId")
* @xmlrpc.returntype #return_int_success()
11 years, 3 months
schema/spacewalk
by Milan Zazrivec
schema/spacewalk/spacewalk-schema-upgrade | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
New commits:
commit 13bc1a910851d1ee7ecaf04f908478b67e352c73
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Jan 11 15:32:03 2013 +0100
894356 - more informative spacewalk-schema-upgrade
This change implements:
1. Print the content of /etc/sysconfig/rhn/schema-upgrade/banner.txt
at the beginning of upgrade.
2. Instruct to verify valid backup of the database schema has been made
before commencing with schema upgrade.
diff --git a/schema/spacewalk/spacewalk-schema-upgrade b/schema/spacewalk/spacewalk-schema-upgrade
index 823f7b0..4435d3a 100755
--- a/schema/spacewalk/spacewalk-schema-upgrade
+++ b/schema/spacewalk/spacewalk-schema-upgrade
@@ -58,6 +58,27 @@ if (not defined $my_schema_release) {
my $target_schema = join '-', $my_schema_name, $my_schema_version, $my_schema_release;
(my $target_schema_norm = $target_schema) =~ s!^(.+-\d+(\.\d+)*)(\..*)*$!$1!;
+my $schema_banner = '/etc/sysconfig/rhn/schema-upgrade/banner.txt';
+if (-f $schema_banner and -s $schema_banner) {
+ local *BANNER;
+ open BANNER, $schema_banner or die "Error reading [$schema_banner]: $!\n";
+ while (<BANNER>) {
+ print;
+ }
+ close BANNER;
+
+ if (not @ARGV or $ARGV[0] ne '-y') {
+ local $| = 1;
+ READ_ENTER:
+ print "Hit Enter to continue or Ctrl+C to interrupt: ";
+ my $in = <STDIN>;
+ chomp $in;
+ if ($in ne '') {
+ goto READ_ENTER;
+ }
+ }
+}
+
print "Schema upgrade: [$start_schema] -> [$target_schema]\n";
my $retried = 0;
@@ -228,6 +249,7 @@ close SQL;
if (not @ARGV or $ARGV[0] ne '-y') {
print "Planning to run spacewalk-sql with [$SCHEMA_UPGRADE_LOGDIR/$stamp-script.sql]\n";
+ print "\nPlase make sure you have a valid backup of your database before continuing.\n\n";
local $| = 1;
READ_ENTER:
print "Hit Enter to continue or Ctrl+C to interrupt: ";
11 years, 3 months
utils/spacewalk-clone-by-date
by StephenHerr
utils/spacewalk-clone-by-date | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
New commits:
commit aabb5bb2b82cefb02a8cf15eb1600fa156aeb567
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Jan 10 16:03:27 2013 -0500
889317 - Add more thorough arg validation to spacewalk-clone-by-date
diff --git a/utils/spacewalk-clone-by-date b/utils/spacewalk-clone-by-date
index 3d7cc50..9df9a55 100755
--- a/utils/spacewalk-clone-by-date
+++ b/utils/spacewalk-clone-by-date
@@ -157,6 +157,21 @@ def parse_args():
(options, args) = parser.parse_args()
+ if options.parents != None:
+ if (len(options.parents) != 2
+ or options.parents[0].startswith('-')
+ or options.parents[1].startswith('-')):
+ raise UserError("The -a / --parents option requires two arguments")
+
+ # have to check this option before we merge with the config file to
+ # ensure that optparse is parsing the args correctly. We have to
+ # check it again after the config file merge.
+ if options.channels != None:
+ for channel_group in options.channels:
+ if (len(channel_group) != 2 or channel_group[0].startswith('-')
+ or channel_group[1].startswith('-')):
+ raise UserError("The -l / --channels option requires two arguments")
+
if options.sample:
print SAMPLE_CONFIG
sys.exit(0)
@@ -164,6 +179,9 @@ def parse_args():
if options.config and options.channels:
raise UserError("Cannot specify both --channels and --config.")
+ if options.config and options.parents:
+ raise UserError("Cannot specify both --parents and --config.")
+
if options.blacklist:
options.blacklist = {"ALL":options.blacklist.split(",")}
@@ -180,12 +198,6 @@ def parse_args():
if existing.startswith('-') or channel_group[existing].startswith('-'):
raise UserError("The -l / --channels option requires two arguments")
- if options.parents != None:
- if (len(options.parents) != 2
- or options.parents[0].startswith('-')
- or options.parents[1].startswith('-')):
- raise UserError("The -a / --parents option requires two arguments")
-
if not options.username:
raise UserError("Username not specified")
11 years, 3 months
utils/cloneByDate.py utils/spacewalk-clone-by-date utils/spacewalk-clone-by-date.sgml
by StephenHerr
utils/cloneByDate.py | 2 +-
utils/spacewalk-clone-by-date | 2 +-
utils/spacewalk-clone-by-date.sgml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 4c21c742bb41d326284118fc0532fb330a24b04a
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Jan 9 14:46:14 2013 -0500
866930 - fixing exception if no date given and adding documentation
diff --git a/utils/cloneByDate.py b/utils/cloneByDate.py
index 83f1e86..807a17c 100644
--- a/utils/cloneByDate.py
+++ b/utils/cloneByDate.py
@@ -550,7 +550,7 @@ class ChannelCloner:
to_clone = []
for err in available_errata:
- if err['issue_date'].date() <= self.to_date.date():
+ if self.to_date and err['issue_date'].date() <= self.to_date.date():
if self.security_only:
if err['advisory_type'] == 'Security Advisory':
to_clone.append(err)
diff --git a/utils/spacewalk-clone-by-date b/utils/spacewalk-clone-by-date
index 3db0532..3d7cc50 100755
--- a/utils/spacewalk-clone-by-date
+++ b/utils/spacewalk-clone-by-date
@@ -134,7 +134,7 @@ def parse_args():
parser.add_option("-l", "--channels", dest="channels", nargs=2, action="append", help="Original channel and clone channel labels space separated (e.g. --channels=rhel-i386-server-5 myclone). Can be specified multiple times.")
parser.add_option("-b", "--blacklist", dest="blacklist", help="Comma separated list of package names (or regular expressions) to exclude from cloned errata (Only added packages will be considered).")
parser.add_option("-r", "--removelist", dest="removelist", help="Comma separated list of package names (or regular expressions) to remove from destination channel (All packages are available for removal).")
- parser.add_option("-d", "--to_date", dest="to_date", help="Clone errata to the specified date (YYYY-MM-DD)")
+ parser.add_option("-d", "--to_date", dest="to_date", help="Clone errata to the specified date (YYYY-MM-DD). If omitted will assume no errata.")
parser.add_option("-y", "--assumeyes", dest='assumeyes', action='store_true', help="Assume yes for any prompts (unattended).")
parser.add_option("-m", "--sample-config", dest='sample', action='store_true', help="Print a sample full configuration file and exit.")
parser.add_option("-k", "--skip_depsolve", dest='skip_depsolve', action='store_true', help="Skip all dependency solving (Not recommended).")
diff --git a/utils/spacewalk-clone-by-date.sgml b/utils/spacewalk-clone-by-date.sgml
index 2b2dde9..ae305e0 100644
--- a/utils/spacewalk-clone-by-date.sgml
+++ b/utils/spacewalk-clone-by-date.sgml
@@ -170,7 +170,7 @@ Utility for cloning errata by date.
<varlistentry>
<term>-d <replaceable>YYYY-MM-DD</replaceable>, --to_date=<replaceable>YYYY-MM-DD</replaceable></term>
<listitem>
- <para>All errata on or before the specified date will be cloned if it does not already exist in the destination channel(s).
+ <para>All errata on or before the specified date will be cloned if it does not already exist in the destination channel(s). If this option is omitted no errata will be cloned.
</para>
</listitem>
</varlistentry>
11 years, 3 months
utils/spacewalk-clone-by-date
by StephenHerr
utils/spacewalk-clone-by-date | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 1d9b7146214e663c77b4209fa1cf8df97d871ce0
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Jan 9 13:41:57 2013 -0500
889317 - username check needs to happen after channel args length check
diff --git a/utils/spacewalk-clone-by-date b/utils/spacewalk-clone-by-date
index 47eb95f..3db0532 100755
--- a/utils/spacewalk-clone-by-date
+++ b/utils/spacewalk-clone-by-date
@@ -172,9 +172,6 @@ def parse_args():
options = merge_config(options)
- if not options.username:
- raise UserError("Username not specified")
-
if options.channels == None or len(options.channels) == 0:
raise UserError("No channels specified. See --help for details.")
else:
@@ -183,6 +180,14 @@ def parse_args():
if existing.startswith('-') or channel_group[existing].startswith('-'):
raise UserError("The -l / --channels option requires two arguments")
+ if options.parents != None:
+ if (len(options.parents) != 2
+ or options.parents[0].startswith('-')
+ or options.parents[1].startswith('-')):
+ raise UserError("The -a / --parents option requires two arguments")
+
+ if not options.username:
+ raise UserError("Username not specified")
if not options.validate:
if options.to_date:
11 years, 3 months
Changes to 'refs/tags/spacewalk-java-1.9.39-1'
by Tomas Lestach
Tag 'spacewalk-java-1.9.39-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-01-09 16:20 +0000
Tagging package [spacewalk-java] version [1.9.39-1] in directory [java/].
Changes since spacewalk-web-1.9.6-1:
Tomas Lestach (3):
868884 - subscribe only to selected config channels via SSM
868884 - fix the 'Replace Existing Subscriptions' SSM config channel option
Automatic commit of package [spacewalk-java] release [1.9.39-1].
---
java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeConfirm.java | 74 ++++------
java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeSubmit.java | 3
java/spacewalk-java.spec | 7
rel-eng/packages/spacewalk-java | 2
4 files changed, 41 insertions(+), 45 deletions(-)
---
11 years, 3 months