spacewalk/setup
by Jan Pazdziora
spacewalk/setup/bin/spacewalk-setup | 2 +-
spacewalk/setup/lib/Spacewalk/Setup.pm | 7 ++-----
2 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit a95b50dbdb294504d9ea54038497ab7d59f4e17d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 26 17:00:19 2011 +0100
Make all system_debug invocations multiparameter.
Addressing
avc: denied { read } for pid=4769 comm="consoletype" path="/var/log/rhn/rhn-installation.log" dev=dm-0 ino=1578084 scontext=unconfined_u:system_r:consoletype_t:s0 tcontext=system_u:object_r:spacewalk_install_log_t:s0 tclass=file
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index bc56bdc..c0c208e 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -1301,7 +1301,7 @@ sub setup_gpg {
Spacewalk::Setup::system_or_exit(['mkdir', '-m', '700', '/root/.gnupg'], 12, 'Could not create /root/.gnupg');
}
- Spacewalk::Setup::system_or_exit(['/usr/bin/gpg --list-keys'], 12, 'Could not run gpg.');
+ Spacewalk::Setup::system_or_exit(['/usr/bin/gpg', '--list-keys'], 12, 'Could not run gpg.');
my $key_path = '/usr/share/rhn/RHN-GPG-KEY';
if ( ! (-e $key_path) ) {
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index bfa14a9..efffba2 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -210,10 +210,7 @@ sub system_debug {
else {
local $SIG{'ALRM'};
if (@args == 1) {
- set_spinning_callback();
- my $ret = system("$args[0] 1>> $logfile 2>&1");
- alarm 0;
- return $ret;
+ die "Single parameter system_debug [@args] not supported.\n";
} else {
local *LOGFILE;
open(LOGFILE, ">>", $logfile) or do {
@@ -433,7 +430,7 @@ sub clear_db {
print loc("** Database: Shutting down spacewalk services that may be using DB.\n");
- system_debug('/usr/sbin/spacewalk-service --exclude=oracle* --exclude=postgresql stop');
+ system_debug('/usr/sbin/spacewalk-service', '--exclude=oracle*', '--exclude=postgresql', 'stop');
print loc("** Database: Services stopped. Clearing DB.\n");
13 years, 2 months
Changes to 'refs/tags/spacewalk-backend-1.3.50-1'
by Michael Mraka
Tag 'spacewalk-backend-1.3.50-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-01-26 13:57 +0000
Tagging package [spacewalk-backend] version [1.3.50-1] in directory [backend/].
Changes since spacewalk-backend-1.3.49-1:
Jan Pazdziora (1):
Report errors even when not -v was specified.
Michael Mraka (3):
672277 - made --use-rhn-date and --use-sync-date mutually exclusive
fixed error message
Automatic commit of package [spacewalk-backend] release [1.3.50-1].
---
backend/satellite_tools/disk_dumper/iss.py | 10 +++++++++-
backend/satellite_tools/disk_dumper/iss_ui.py | 8 +++-----
backend/satellite_tools/spacewalk-data-fsck | 17 ++++++++++-------
backend/spacewalk-backend.spec | 7 ++++++-
rel-eng/packages/spacewalk-backend | 2 +-
5 files changed, 29 insertions(+), 15 deletions(-)
---
13 years, 2 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 7 ++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 1cf08874210f43f496fa867f48d6eeb8d7f40c59
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 26 14:57:06 2011 +0100
Automatic commit of package [spacewalk-backend] release [1.3.50-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 7b7d856..2938c8c 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.3.49
+Version: 1.3.50
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -684,6 +684,11 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Jan 26 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.3.50-1
+- fixed error message
+- 672277 - made --use-rhn-date and --use-sync-date mutually exclusive
+- Report errors even when not -v was specified.
+
* Wed Jan 26 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.3.49-1
- fixed AttributeError: ContentSource instance has no attribute 'proxy'
- make osa ping work properly again
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 92749e9..8c2b9f7 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.3.49-1 backend/
+1.3.50-1 backend/
13 years, 2 months
2 commits - backend/satellite_tools
by Michael Mraka
backend/satellite_tools/disk_dumper/iss.py | 10 +++++++++-
backend/satellite_tools/disk_dumper/iss_ui.py | 8 +++-----
2 files changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 2e602d8ac695a3836236e9b8b17732c670629461
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 26 14:54:32 2011 +0100
fixed error message
diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satellite_tools/disk_dumper/iss.py
index c057bb1..06ef7da 100644
--- a/backend/satellite_tools/disk_dumper/iss.py
+++ b/backend/satellite_tools/disk_dumper/iss.py
@@ -929,7 +929,7 @@ class ExporterMain:
self.options.use_rhn_date=True
if self.options.end_date and not self.options.start_date:
- sys.stderr.write("--end-date must be used with --start-date.")
+ sys.stderr.write("--end-date must be used with --start-date.\n")
sys.exit(1)
if self.options.end_date and len(self.options.end_date) < 8:
commit 5d844a9a6f173089700bdea4e06e9c35e8751b9c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 26 14:53:18 2011 +0100
672277 - made --use-rhn-date and --use-sync-date mutually exclusive
diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satellite_tools/disk_dumper/iss.py
index 2d31b6f..c057bb1 100644
--- a/backend/satellite_tools/disk_dumper/iss.py
+++ b/backend/satellite_tools/disk_dumper/iss.py
@@ -920,6 +920,14 @@ class ExporterMain:
sys.stdout.write("--dir not included!\n")
sys.exit(0)
+ if self.options.use_sync_date and self.options.use_rhn_date:
+ sys.stderr.write("--use-rhn-date and --use-sync-date are mutually exclusive.\n")
+ sys.exit(1)
+ elif self.options.use_sync_date:
+ self.options.use_rhn_date=False
+ else:
+ self.options.use_rhn_date=True
+
if self.options.end_date and not self.options.start_date:
sys.stderr.write("--end-date must be used with --start-date.")
sys.exit(1)
diff --git a/backend/satellite_tools/disk_dumper/iss_ui.py b/backend/satellite_tools/disk_dumper/iss_ui.py
index e217a76..3a5e063 100644
--- a/backend/satellite_tools/disk_dumper/iss_ui.py
+++ b/backend/satellite_tools/disk_dumper/iss_ui.py
@@ -37,11 +37,9 @@ class UI:
option( "--end-date", action="store",
help="The end date limit that the last modified dates are compared against. Should be in the format 'YYYYMMDDHH24MISS'."),
option( "--use-rhn-date", action="store_true",
- help="Limit exported packages according to the date when they appeared at Red Hat Network.",
- dest="use_rhn_date", default=True),
- option( "--use-sync-date", action="store_false",
- help="Limit exported packages according to the date they where pulled into satellite.",
- dest="use_rhn_date"),
+ help="Limit exported packages according to the date when they appeared at Red Hat Network."),
+ option( "--use-sync-date", action="store_true",
+ help="Limit exported packages according to the date they where pulled into satellite."),
option( "--make-isos", action="store",
help="Create channel dump isos a directory called satellite-isos. Usage: --make-isos=cd or dvd"),
option("-p", "--print-configuration", action="store_true", default=0,
13 years, 2 months
backend/satellite_tools
by Jan Pazdziora
backend/satellite_tools/spacewalk-data-fsck | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
New commits:
commit bd35b1d6ee482bfd455df63f08fccf641004f36c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 26 13:55:06 2011 +0100
Report errors even when not -v was specified.
diff --git a/backend/satellite_tools/spacewalk-data-fsck b/backend/satellite_tools/spacewalk-data-fsck
index 2c3d3be..0e6b934 100755
--- a/backend/satellite_tools/spacewalk-data-fsck
+++ b/backend/satellite_tools/spacewalk-data-fsck
@@ -112,7 +112,7 @@ def check_db_vs_disk(options):
def check_disk_exists(abs_path):
ret = 0
if not os.path.isfile(abs_path):
- log(1, "File missing: %s" % abs_path)
+ log(0, "File missing: %s" % abs_path)
ret = 1
return ret
@@ -120,7 +120,7 @@ def check_disk_size(abs_path, size):
file_size = os.stat(abs_path)[stat.ST_SIZE]
ret = 0
if file_size != size:
- log(1, "File size mismatch: %s (%s vs. %s)" % (abs_path, size, file_size))
+ log(0, "File size mismatch: %s (%s vs. %s)" % (abs_path, size, file_size))
ret = 1
return ret
@@ -150,7 +150,7 @@ def check_disk_nevrao(abs_path, row):
for key in ('org_id', 'checksum_prefix', 'name', 'evr', 'arch', 'checksum',
'basename'):
if file[key] != row[key]:
- log(1, "File path mismatch: %s (%s: %s vs. %s)" % (abs_path, key, row[key],
+ log(0, "File path mismatch: %s (%s: %s vs. %s)" % (abs_path, key, row[key],
file[key]))
ret = 1
return ret
@@ -164,7 +164,7 @@ def check_disk_checksum(abs_path, checksum_type, checksum):
file_checksum = None
ret = 0
if file_checksum != checksum:
- log(1, "File checksum mismatch: %s (%s: %s vs. %s)" %
+ log(0, "File checksum mismatch: %s (%s: %s vs. %s)" %
(abs_path, checksum_type, checksum, file_checksum))
ret = 1
return ret
@@ -211,7 +211,7 @@ def check_disk_vs_db(disk_content=None, db_content=None):
def not_in_db(path, options):
if options.remove:
- log(1, "Removed file missing in db: %s" % (path))
+ log(0, "Removed file missing in db: %s" % (path))
os.unlink(path)
dirname = os.path.dirname(path)
while dirname != CFG.MOUNT_POINT:
@@ -224,11 +224,14 @@ def not_in_db(path, options):
raise e
dirname = os.path.dirname(dirname)
else:
- log(1, "File missing in db: %s" % (path))
+ log(0, "File missing in db: %s" % (path))
def log(level, *args):
log_debug(level, *args)
- if options.verbose >= level:
+ verbose = options.verbose
+ if not verbose:
+ verbose = 0
+ if verbose >= level:
print (', '.join(map(lambda i: str(i), args)))
if __name__ == '__main__':
13 years, 2 months
Changes to 'refs/tags/spacewalk-backend-1.3.49-1'
by Michael Mraka
Tag 'spacewalk-backend-1.3.49-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-01-26 12:50 +0000
Tagging package [spacewalk-backend] version [1.3.49-1] in directory [backend/].
Changes since NPalert-1.126.18-1:
Jan Pazdziora (2):
Catch situation when both .sql and .sql.oracle or .sql.postgresql schema upgrade scripts exist.
For upgrades, missing PostgreSQL equivalent is an error.
Michael Mraka (3):
fixed channel list in create kickstart profile (PG)
fixed AttributeError: ContentSource instance has no attribute 'proxy'
Automatic commit of package [spacewalk-backend] release [1.3.49-1].
---
backend/satellite_tools/repo_plugins/yum_src.py | 2 -
backend/spacewalk-backend.spec | 6 ++++-
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 3 --
rel-eng/packages/spacewalk-backend | 2 -
schema/spacewalk/schema-source-sanity-check.pl | 14 ++++++++----
5 files changed, 18 insertions(+), 9 deletions(-)
---
13 years, 2 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 435942e5498c9b104f32546c9cd646e4c5111a35
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 26 13:50:09 2011 +0100
Automatic commit of package [spacewalk-backend] release [1.3.49-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index d2cef22..7b7d856 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.3.48
+Version: 1.3.49
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -684,6 +684,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Jan 26 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.3.49-1
+- fixed AttributeError: ContentSource instance has no attribute 'proxy'
+- make osa ping work properly again
+
* Mon Jan 24 2011 Jan Pazdziora 1.3.48-1
- do not print TB if we get unknown type (msuchy(a)redhat.com)
- Make rhn-schema-version work on PostgreSQL.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 46bfda2..92749e9 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.3.48-1 backend/
+1.3.49-1 backend/
13 years, 2 months
2 commits - backend/satellite_tools java/code
by Michael Mraka
backend/satellite_tools/repo_plugins/yum_src.py | 2 +-
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 98edcaf5762b16d47ca15c4c32fb22a9a20d6254
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 26 13:48:23 2011 +0100
fixed AttributeError: ContentSource instance has no attribute 'proxy'
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py b/backend/satellite_tools/repo_plugins/yum_src.py
index 7afc6d4..982ff48 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -59,7 +59,7 @@ class ContentSource:
repo.mirrorlist = self.url
repo.baseurl = [self.url]
repo.basecachedir = self.cache_dir
- if self.proxy is not None:
+ if self.proxy_url is not None:
repo.proxy = self.proxy_url
warnings = YumWarnings()
commit 3e8b50c53627391ff3e1ef5a46239724b0bcc6d6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 26 10:50:59 2011 +0100
fixed channel list in create kickstart profile (PG)
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
index 9a03d85..0bf1280 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
@@ -242,11 +242,10 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
SELECT {c.*}
FROM rhnChannel c,
rhnSharedChannelView sc,
- rhnChannelCloned c_1_
+ LEFT OUTER JOIN rhnChannelCloned c_1_ ON c.id = c_1_.id
WHERE sc.parent_channel = :cid
AND sc.org_trust_id = :org_id
AND sc.id = c.id
- AND c.id = c_1_.id (+)
]]>
<return alias="c" class="com.redhat.rhn.domain.channel.Channel" />
</sql-query>
13 years, 2 months
2 commits - schema/spacewalk
by Jan Pazdziora
schema/spacewalk/schema-source-sanity-check.pl | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
New commits:
commit c3075600d5903d128fdddf2497c11d3525b71cae
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 25 20:15:07 2011 +0100
For upgrades, missing PostgreSQL equivalent is an error.
diff --git a/schema/spacewalk/schema-source-sanity-check.pl b/schema/spacewalk/schema-source-sanity-check.pl
index 36c6ce9..1b33dd2 100644
--- a/schema/spacewalk/schema-source-sanity-check.pl
+++ b/schema/spacewalk/schema-source-sanity-check.pl
@@ -52,8 +52,13 @@ for my $c (sort keys %{ $files{common} }) {
for my $c (sort keys %{ $files{oracle} }) {
next unless $c =~ /\.(sql|pks|pkb)$/;
if (not exists $files{postgres}{$c}) {
- print "Oracle file [$c] is not in postgres (ignoring for now)\n" if $show_ignored;
- # $error = 1;
+ if ($c =~ /^upgrade/) {
+ print "Oracle file [$c] is not in PostgreSQL variant\n";
+ $error = 1;
+ } else {
+ print "Oracle file [$c] is not in postgres (ignoring for now)\n" if $show_ignored;
+ # $error = 1;
+ }
}
}
commit 53d0fdc339b3ac8ef8bd267873d9d3d72a2dc44e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 25 20:09:40 2011 +0100
Catch situation when both .sql and .sql.oracle or .sql.postgresql schema upgrade scripts exist.
diff --git a/schema/spacewalk/schema-source-sanity-check.pl b/schema/spacewalk/schema-source-sanity-check.pl
index e4bbbe5..36c6ce9 100644
--- a/schema/spacewalk/schema-source-sanity-check.pl
+++ b/schema/spacewalk/schema-source-sanity-check.pl
@@ -25,11 +25,12 @@ for my $dir (qw( common oracle postgres upgrade )) {
}
if ($dir eq 'upgrade') {
my $generic = $name;
+ my $db = 'common';
if ($generic =~ s/\.(oracle|postgresql)$//) {
- my $db = $1;
+ $db = $1;
$db = 'postgres' if $db eq 'postgresql';
- $files{$db}{$generic} = $name;
}
+ $files{$db}{$generic} = $name;
} else {
my $rname = substr($name, length($dir) + 1);
$files{$dir}{$rname} = $name;
13 years, 2 months
Changes to 'refs/tags/NPalert-1.126.18-1'
by Jan Pazdziora
Tag 'NPalert-1.126.18-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-01-25 17:06 +0000
Tagging package [NPalert] version [1.126.18-1] in directory [monitoring/NPalert/].
Changes since spacewalk-schema-1.3.17-1:
Jan Pazdziora (1):
Automatic commit of package [NPalert] release [1.126.18-1].
Milan Zazrivec (1):
make osa ping work properly again
---
backend/server/rhnServer/server_lib.py | 2 +-
monitoring/NPalert/NPalert.spec | 5 ++++-
rel-eng/packages/NPalert | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
13 years, 2 months