rel-eng/comps
by Tomas Lestach
rel-eng/comps/comps-spacewalk-server-rhel5.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
New commits:
commit 6d97a884322c11c3ca74c5a9f39ce931e0369dca
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 21 11:03:33 2011 +0100
Introducing spacewalk-server-no-install rhel5 server comps group
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
index d2020bb..2df40ae 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
@@ -220,4 +220,14 @@
<packagereq type="optional">xpp3-javadoc</packagereq>
</packagelist>
</group>
+ <group>
+ <id>spacewalk-server-no-install</id>
+ <name>Spacewalk Server Junk</name>
+ <description>Spacewalk Server Non-installatble Packages</description>
+ <uservisible>false</uservisible>
+ <packagelist>
+ <packagereq type="optional">oracle-rhnsat-selinux</packagereq>
+ <packagereq type="optional">perl-DBD-Oracle-explain</packagereq>
+ </packagelist>
+ </group>
</comps>
13 years, 3 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/spacewalk-schema-upgrade | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9b2c826cbe99bea2cf67fd0eba5e4fcd770320d7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 21 11:03:17 2011 +0100
Fixing typo.
diff --git a/schema/spacewalk/spacewalk-schema-upgrade b/schema/spacewalk/spacewalk-schema-upgrade
index 0a78b3b..74b614a 100755
--- a/schema/spacewalk/spacewalk-schema-upgrade
+++ b/schema/spacewalk/spacewalk-schema-upgrade
@@ -39,7 +39,7 @@ EOF
if (not defined $schema_version) {
die "No existing schema version info found in rhnVersionInfo.\n";
}
-if (not $schema_version =~ /^rhn-satellite-schema-|^spacewalk-schema-|^satellite-schema0/) {
+if (not $schema_version =~ /^rhn-satellite-schema-|^spacewalk-schema-|^satellite-schema-/) {
die "Unknown schema name [$schema_version] found.\n";
}
13 years, 3 months
2 commits - schema/spacewalk
by Jan Pazdziora
schema/spacewalk/spacewalk-schema-upgrade | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a2a07f380a7f334dd161657444a5c2bef5a0d3a2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jan 20 18:19:30 2011 +0100
Fixing PE.evr.as_vre_simple() issue on PostgreSQL.
Addressing
psql:<stdin>:5: ERROR: cross-database references are not implemented: pe.evr.as_vre_simple
diff --git a/schema/spacewalk/spacewalk-schema-upgrade b/schema/spacewalk/spacewalk-schema-upgrade
index 3532f11..0a78b3b 100755
--- a/schema/spacewalk/spacewalk-schema-upgrade
+++ b/schema/spacewalk/spacewalk-schema-upgrade
@@ -30,7 +30,7 @@ if ($test ne '123') {
}
my $schema_version = run_query(<<EOF);
- select rhnPackageName.name || '-' || PE.evr.as_vre_simple()
+ select rhnPackageName.name || '-' || evr_t_as_vre_simple(PE.evr)
from rhnVersionInfo, rhnPackageName, rhnPackageEVR PE
where rhnVersionInfo.label = 'schema'
and rhnVersionInfo.name_id = rhnPackageName.id
@@ -258,7 +258,7 @@ if ($?) {
}
my $new_schema_version = run_query(<<EOF);
- select rhnPackageName.name || '-' || PE.evr.as_vre_simple()
+ select rhnPackageName.name || '-' || evr_t_as_vre_simple(PE.evr)
from rhnVersionInfo, rhnPackageName, rhnPackageEVR PE
where rhnVersionInfo.label = 'schema'
and rhnVersionInfo.name_id = rhnPackageName.id
commit f1c4c71057a8d9042f1375c8f879d3da1778632d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jan 20 18:16:41 2011 +0100
Concatenate strings.
Addressing
psql:<stdin>:1: ERROR: operator does not exist: integer || integer
LINE 1: select 1 || 2 || 3 as testing from dual;
^
HINT: No operator matches the given name and argument type(s). You might need to add explicit type casts.
diff --git a/schema/spacewalk/spacewalk-schema-upgrade b/schema/spacewalk/spacewalk-schema-upgrade
index dde099b..3532f11 100755
--- a/schema/spacewalk/spacewalk-schema-upgrade
+++ b/schema/spacewalk/spacewalk-schema-upgrade
@@ -21,7 +21,7 @@ if (not defined $options{db_backend}) {
die "Config file [$config_file] does not seem to have database backend info (db_backend) set.\n";
}
-my $test = run_query("select 1 || 2 || 3 as testing from dual;");
+my $test = run_query("select '1' || '2' || '3' as testing from dual;");
if (not defined $test) {
die "Connect to database was not successful.\n";
}
13 years, 3 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/spacewalk-schema-upgrade | 6 ------
1 file changed, 6 deletions(-)
New commits:
commit 311dfacc49957dbc794fbf73d099add3d1ff233b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 21 10:41:52 2011 +0100
Removing Oracle-specific commands which are already in spacewalk-sql.
diff --git a/schema/spacewalk/spacewalk-schema-upgrade b/schema/spacewalk/spacewalk-schema-upgrade
index 1695262..dde099b 100755
--- a/schema/spacewalk/spacewalk-schema-upgrade
+++ b/schema/spacewalk/spacewalk-schema-upgrade
@@ -282,12 +282,6 @@ sub run_query {
my ($command) = @_;
my $pid = IPC::Open3::open3(my $wfh, my $rfh, '>&STDERR',
'spacewalk-sql', '--select-mode', '-') or return;
- print $wfh <<EOF;
-whenever oserror exit failure
-whenever sqlerror exit sql.sqlcode
-set linesize 4000
-set pagesize 50000
-EOF
print $wfh $command;
print $wfh "\n";
close $wfh;
13 years, 3 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/spacewalk-schema-upgrade | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
New commits:
commit 7f73cf0ac9528bf3987835cbbd4fab7ce01692c6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jan 20 15:02:47 2011 +0100
Change spacewalk-schema-upgrade to use spacewalk-sql.
diff --git a/schema/spacewalk/spacewalk-schema-upgrade b/schema/spacewalk/spacewalk-schema-upgrade
index 3ac06d9..1695262 100755
--- a/schema/spacewalk/spacewalk-schema-upgrade
+++ b/schema/spacewalk/spacewalk-schema-upgrade
@@ -17,20 +17,16 @@ if (not -e $config_file) {
my %options;
Spacewalk::Setup::read_config($config_file, \%options);
-if (not defined $options{default_db}) {
- if (defined $options{'db_name'} and defined $options{'db_user'} and defined $options{'db_password'}) {
- $options{default_db} = "$options{'db_user'}/$options{'db_password'}\@$options{'db_name'}";
- } else {
- die "Config file [$config_file] does not seem to have database connection string (default_db) set.\n";
- }
+if (not defined $options{db_backend}) {
+ die "Config file [$config_file] does not seem to have database backend info (db_backend) set.\n";
}
my $test = run_query("select 1 || 2 || 3 as testing from dual;");
if (not defined $test) {
- die "Connect to [$options{default_db}] was not successful.\n";
+ die "Connect to database was not successful.\n";
}
if ($test ne '123') {
- die "Test select from [$options{default_db}] did not give expected results.\n";
+ die "Test select from database did not give expected results.\n";
}
my $schema_version = run_query(<<EOF);
@@ -232,7 +228,7 @@ print SQL $in;
close SQL;
if (not @ARGV or $ARGV[0] ne '-y') {
- print "Planning to run sqlplus with [$SCHEMA_UPGRADE_LOGDIR/$stamp-script.sql]\n";
+ print "Planning to run spacewalk-sql with [$SCHEMA_UPGRADE_LOGDIR/$stamp-script.sql]\n";
local $| = 1;
READ_ENTER:
print "Hit Enter to continue or Ctrl+C to interrupt: ";
@@ -250,10 +246,10 @@ open LOG, '>>', $logfile or die "Error writing logfile [$logfile]: $!\n";
system("/sbin/restorecon $logfile 2>&1 > /dev/null");
-print "Executing sqlplus, the log is in [$logfile].\n";
+print "Executing spacewalk-sql, the log is in [$logfile].\n";
my $pid = IPC::Open3::open3(my $wfh, '>&LOG', '>&LOG',
- 'sqlplus', '-S', $options{default_db}, "\(a)$SCHEMA_UPGRADE_LOGDIR/$stamp-script.sql") or die "Error running sqlplus: $!\n";
+ 'spacewalk-sql', '--select-mode', "$SCHEMA_UPGRADE_LOGDIR/$stamp-script.sql") or die "Error running spacewalk-sql: $!\n";
close $wfh;
waitpid $pid, 0;
@@ -285,7 +281,7 @@ exit;
sub run_query {
my ($command) = @_;
my $pid = IPC::Open3::open3(my $wfh, my $rfh, '>&STDERR',
- 'sqlplus', '-S', $options{default_db}) or return;
+ 'spacewalk-sql', '--select-mode', '-') or return;
print $wfh <<EOF;
whenever oserror exit failure
whenever sqlerror exit sql.sqlcode
@@ -397,7 +393,7 @@ with B<-y> switch).
Proceed with the schema upgrade following the upgrade path found, putting
the output from executed sql scripts (including errors if any)
into F</var/log/spacewalk/schema-upgrade>. For this step it is important
-that you have sqlplus command in your PATH.
+that you have spacewalk-sql command in your PATH.
=back
@@ -412,8 +408,7 @@ every major upgrade step).
=item F</etc/rhn/rhn.conf>
-Default configuration file containing database connection string
-(default_db option).
+Default configuration file containing database connection information.
=item F</var/log/spacewalk/schema-upgrade>
13 years, 3 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/spacewalk-schema-upgrade | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
New commits:
commit 679dfeeb4cf7eb5c46affefb11394de53c651878
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 21 10:34:45 2011 +0100
Do logging by redirecting stdout/stderr of sqlplus.
We are preparing for psql which does not have spool.
diff --git a/schema/spacewalk/spacewalk-schema-upgrade b/schema/spacewalk/spacewalk-schema-upgrade
index dc1d468..3ac06d9 100755
--- a/schema/spacewalk/spacewalk-schema-upgrade
+++ b/schema/spacewalk/spacewalk-schema-upgrade
@@ -140,9 +140,6 @@ my $stamp = sprintf "%04d%02d%02d-%02d%02d%02d", $year + 1900, $mon + 1, $mday,
my $start = $start_schema_norm;
my $in = <<EOF;
-spool $SCHEMA_UPGRADE_LOGDIR/$stamp-begin.log append
-whenever sqlerror exit sql.sqlcode
-
update rhnVersionInfo
set label = 'schema-from-' || to_char(created, 'YYYYMMDD-HH24MISS'),
modified = sysdate
@@ -177,11 +174,6 @@ while (@path) {
$i--;
}
}
- my $logfile = $SCHEMA_UPGRADE_LOGDIR . "/$stamp-to-$t.log";
-
- $in .= <<EOF;
-
-EOF
for my $fullname (@files) {
(my $name = $fullname) =~ s!^.*/!!;
@@ -196,9 +188,6 @@ EOF
$f_in =~ s!^--.*\n!!gm;
$f_in =~ s!\[\[.*?\]\]|__.*?__!$default_tablespace!g;
$in .= <<EOF;
-set echo on
-spool $logfile append
-whenever sqlerror exit sql.sqlcode
select '$dir/$name' from dual;
EOF
$in .= $f_in;
@@ -209,8 +198,6 @@ EOF
}
$in .= <<EOF;
-spool $SCHEMA_UPGRADE_LOGDIR/$stamp-end.log append
-whenever sqlerror exit sql.sqlcode
exec dbms_utility.compile_schema(user);
@@ -256,15 +243,22 @@ if (not @ARGV or $ARGV[0] ne '-y') {
}
}
-print "Executing sqlplus, the logs are in $SCHEMA_UPGRADE_LOGDIR/$stamp-*.\n";
+my $logfile = $SCHEMA_UPGRADE_LOGDIR . "/$stamp-to-$target_schema_norm.log";
+
+local * LOG;
+open LOG, '>>', $logfile or die "Error writing logfile [$logfile]: $!\n";
+
+system("/sbin/restorecon $logfile 2>&1 > /dev/null");
+
+print "Executing sqlplus, the log is in [$logfile].\n";
-my $pid = IPC::Open3::open3(my $wfh, my $rfh, '>&STDERR',
+my $pid = IPC::Open3::open3(my $wfh, '>&LOG', '>&LOG',
'sqlplus', '-S', $options{default_db}, "\(a)$SCHEMA_UPGRADE_LOGDIR/$stamp-script.sql") or die "Error running sqlplus: $!\n";
close $wfh;
waitpid $pid, 0;
if ($?) {
- die "Upgrade failed, please see log in [$SCHEMA_UPGRADE_LOGDIR/].\n";
+ die "Upgrade failed, please see log [$logfile].\n";
}
my $new_schema_version = run_query(<<EOF);
13 years, 3 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/spacewalk-schema-upgrade | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
New commits:
commit 4fbe707d765937ee3d7888c18cf7add636044813
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 21 10:23:52 2011 +0100
Make the run_query only run query, and execute the upgrade with separate sqlplus call.
diff --git a/schema/spacewalk/spacewalk-schema-upgrade b/schema/spacewalk/spacewalk-schema-upgrade
index 2bf241a..dc1d468 100755
--- a/schema/spacewalk/spacewalk-schema-upgrade
+++ b/schema/spacewalk/spacewalk-schema-upgrade
@@ -25,7 +25,7 @@ if (not defined $options{default_db}) {
}
}
-my $test = run_query(\%options, "select 1 || 2 || 3 as testing from dual;");
+my $test = run_query("select 1 || 2 || 3 as testing from dual;");
if (not defined $test) {
die "Connect to [$options{default_db}] was not successful.\n";
}
@@ -33,7 +33,7 @@ if ($test ne '123') {
die "Test select from [$options{default_db}] did not give expected results.\n";
}
-my $schema_version = run_query(\%options, <<EOF);
+my $schema_version = run_query(<<EOF);
select rhnPackageName.name || '-' || PE.evr.as_vre_simple()
from rhnVersionInfo, rhnPackageName, rhnPackageEVR PE
where rhnVersionInfo.label = 'schema'
@@ -118,7 +118,7 @@ if (not exists $upgrade_path{$start_schema_norm}) {
my @path = get_shortest_path($upgrade_path{$start_schema_norm}, $target_schema_norm);
print "The path: ", (join " -> ", map "[$_]", $start_schema_norm, @path), "\n";
-my $default_tablespace = run_query(\%options, <<EOF);
+my $default_tablespace = run_query(<<EOF);
select default_tablespace
from user_users
where username = sys_context('userenv', 'session_user');
@@ -258,12 +258,16 @@ if (not @ARGV or $ARGV[0] ne '-y') {
print "Executing sqlplus, the logs are in $SCHEMA_UPGRADE_LOGDIR/$stamp-*.\n";
-if (not run_query({ default_db => $options{default_db}, no_query => 1 },
- "\(a)$SCHEMA_UPGRADE_LOGDIR/$stamp-script.sql")) {
+my $pid = IPC::Open3::open3(my $wfh, my $rfh, '>&STDERR',
+ 'sqlplus', '-S', $options{default_db}, "\(a)$SCHEMA_UPGRADE_LOGDIR/$stamp-script.sql") or die "Error running sqlplus: $!\n";
+close $wfh;
+
+waitpid $pid, 0;
+if ($?) {
die "Upgrade failed, please see log in [$SCHEMA_UPGRADE_LOGDIR/].\n";
}
-my $new_schema_version = run_query(\%options, <<EOF);
+my $new_schema_version = run_query(<<EOF);
select rhnPackageName.name || '-' || PE.evr.as_vre_simple()
from rhnVersionInfo, rhnPackageName, rhnPackageEVR PE
where rhnVersionInfo.label = 'schema'
@@ -285,10 +289,9 @@ print "The database schema was upgraded to version [$target_schema].\n";
exit;
sub run_query {
- my ($options, $command) = @_;
- my @silent = ( '-S' ) unless $options->{no_query};
+ my ($command) = @_;
my $pid = IPC::Open3::open3(my $wfh, my $rfh, '>&STDERR',
- 'sqlplus', @silent, $options->{default_db}) or return;
+ 'sqlplus', '-S', $options{default_db}) or return;
print $wfh <<EOF;
whenever oserror exit failure
whenever sqlerror exit sql.sqlcode
13 years, 3 months
3 commits - schema/spacewalk
by Jan Pazdziora
schema/spacewalk/spacewalk-schema-upgrade | 76 +++++++++++-------------------
1 file changed, 29 insertions(+), 47 deletions(-)
New commits:
commit 40a553baa17f95dc8904020a1d1ef2058e4f93f3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jan 20 16:41:03 2011 +0100
Do explicit exit; further down there are just subroutine definitions.
diff --git a/schema/spacewalk/spacewalk-schema-upgrade b/schema/spacewalk/spacewalk-schema-upgrade
index 8175e58..2bf241a 100755
--- a/schema/spacewalk/spacewalk-schema-upgrade
+++ b/schema/spacewalk/spacewalk-schema-upgrade
@@ -282,6 +282,8 @@ EOF
print "The database schema was upgraded to version [$target_schema].\n";
+exit;
+
sub run_query {
my ($options, $command) = @_;
my @silent = ( '-S' ) unless $options->{no_query};
commit 9942e8f7c88602ab4386b6bd5df7fbb5583b471e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jan 20 16:38:41 2011 +0100
Use the dashes after heading to find the start of the result.
diff --git a/schema/spacewalk/spacewalk-schema-upgrade b/schema/spacewalk/spacewalk-schema-upgrade
index 5a80bea..8175e58 100755
--- a/schema/spacewalk/spacewalk-schema-upgrade
+++ b/schema/spacewalk/spacewalk-schema-upgrade
@@ -287,29 +287,30 @@ sub run_query {
my @silent = ( '-S' ) unless $options->{no_query};
my $pid = IPC::Open3::open3(my $wfh, my $rfh, '>&STDERR',
'sqlplus', @silent, $options->{default_db}) or return;
- if (not $options->{no_query}) {
- print $wfh <<EOF;
-set linesize 4000
-set pagesize 0
-set colsep ":"
-set trimout on
-set heading off
-set wrap off
-EOF
- }
print $wfh <<EOF;
whenever oserror exit failure
whenever sqlerror exit sql.sqlcode
+set linesize 4000
+set pagesize 50000
EOF
print $wfh $command;
print $wfh "\n";
close $wfh;
- my $out = <$rfh>;
+ my $out;
+ my $seen_dashes = 0;
+ while (<$rfh>) {
+ if (not defined $out and $seen_dashes) {
+ $out = $_;
+ last;
+ }
+ if (/---/) {
+ $seen_dashes = 1;
+ }
+ }
close $rfh;
waitpid $pid, 0;
if ($?) {
- print STDERR $out;
return;
}
commit 0e203b88921e1bd03493a8be2a12209e93800128
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jan 20 15:47:26 2011 +0100
Changing run_query to just return the first record, in the query mode.
diff --git a/schema/spacewalk/spacewalk-schema-upgrade b/schema/spacewalk/spacewalk-schema-upgrade
index 937e3f6..5a80bea 100755
--- a/schema/spacewalk/spacewalk-schema-upgrade
+++ b/schema/spacewalk/spacewalk-schema-upgrade
@@ -25,34 +25,29 @@ if (not defined $options{default_db}) {
}
}
-my $test = run_query(\%options, "select 1, 2 from dual;");
+my $test = run_query(\%options, "select 1 || 2 || 3 as testing from dual;");
if (not defined $test) {
die "Connect to [$options{default_db}] was not successful.\n";
}
-if (@$test != 1
- || @{ $test->[0] } != 2
- || $test->[0][0] ne '1'
- || $test->[0][1] ne '2') {
+if ($test ne '123') {
die "Test select from [$options{default_db}] did not give expected results.\n";
}
-my $schema_versions = run_query(\%options, <<EOF);
- select rhnPackageName.name, PE.evr.as_vre_simple()
+my $schema_version = run_query(\%options, <<EOF);
+ select rhnPackageName.name || '-' || PE.evr.as_vre_simple()
from rhnVersionInfo, rhnPackageName, rhnPackageEVR PE
where rhnVersionInfo.label = 'schema'
and rhnVersionInfo.name_id = rhnPackageName.id
and rhnVersionInfo.evr_id = PE.id;
EOF
-if (not @$schema_versions) {
+if (not defined $schema_version) {
die "No existing schema version info found in rhnVersionInfo.\n";
}
-if ($schema_versions->[0][0] ne 'rhn-satellite-schema'
- and $schema_versions->[0][0] ne 'spacewalk-schema'
- and $schema_versions->[0][0] ne 'satellite-schema') {
- die "Unknown schema name [$schema_versions->[0][0]] found.\n";
+if (not $schema_version =~ /^rhn-satellite-schema-|^spacewalk-schema-|^satellite-schema0/) {
+ die "Unknown schema name [$schema_version] found.\n";
}
-my $start_schema = join '-', @{ $schema_versions->[0] };
+my $start_schema = $schema_version;
(my $start_schema_norm = $start_schema) =~ s!^(.+-\d+(\.\d+)*)(\..*)*$!$1!;
my $my_schema_version_out = `rpm -qf --qf '%{name} %{version} %{release}\n' /etc/sysconfig/rhn/oracle/schema-override 2> /dev/null`;
@@ -123,17 +118,14 @@ if (not exists $upgrade_path{$start_schema_norm}) {
my @path = get_shortest_path($upgrade_path{$start_schema_norm}, $target_schema_norm);
print "The path: ", (join " -> ", map "[$_]", $start_schema_norm, @path), "\n";
-my $default_tablespace_data = run_query(\%options, <<EOF);
+my $default_tablespace = run_query(\%options, <<EOF);
select default_tablespace
from user_users
where username = sys_context('userenv', 'session_user');
EOF
-if (not defined $default_tablespace_data
- or not defined $default_tablespace_data->[0]
- or not defined $default_tablespace_data->[0][0]) {
+if (not defined $default_tablespace) {
die "Failed to retrieve default_tablespace from database.\n";
}
-my $default_tablespace = $default_tablespace_data->[0][0];
mkdir "/var/log/spacewalk", 0755;
mkdir $SCHEMA_UPGRADE_LOGDIR, 0755;
@@ -271,20 +263,20 @@ if (not run_query({ default_db => $options{default_db}, no_query => 1 },
die "Upgrade failed, please see log in [$SCHEMA_UPGRADE_LOGDIR/].\n";
}
-my $new_schema_versions = run_query(\%options, <<EOF);
+my $new_schema_version = run_query(\%options, <<EOF);
select rhnPackageName.name || '-' || PE.evr.as_vre_simple()
from rhnVersionInfo, rhnPackageName, rhnPackageEVR PE
where rhnVersionInfo.label = 'schema'
and rhnVersionInfo.name_id = rhnPackageName.id
and rhnVersionInfo.evr_id = PE.id;
EOF
-if (not @$new_schema_versions) {
+if (not defined $new_schema_version) {
die "Upgrade seems to have run OK yet new schema version is not in rhnVersionInfo.\n";
}
-if ($new_schema_versions->[0][0] ne $target_schema) {
+if ($new_schema_version ne $target_schema) {
die <<EOF;
Upgrade seems to have run OK yet new schema version is
-[$new_schema_versions->[0][0]], not [$target_schema].
+ [$new_schema_version], not [$target_schema].
EOF
}
@@ -313,11 +305,7 @@ EOF
print $wfh "\n";
close $wfh;
- my $out;
- {
- local $/ = undef;
- $out = <$rfh>;
- }
+ my $out = <$rfh>;
close $rfh;
waitpid $pid, 0;
if ($?) {
@@ -325,17 +313,8 @@ EOF
return;
}
- my @data;
- for (split /\n/, $out) {
- next if /^\s*$/;
- my @values = split /:/;
- for (@values) {
- s/^\s+//;
- s/\s+$//;
- }
- push @data, \@values;
- }
- return \@data;
+ $out =~ s/^\s+|\s+$//g if defined $out;
+ return $out;
}
sub get_shortest_path {
13 years, 3 months
Changes to 'refs/tags/spacewalk-proxy-1.3.11-1'
by Tomas Lestach
Tag 'spacewalk-proxy-1.3.11-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-01-20 16:50 +0000
Tagging package [spacewalk-proxy] version [1.3.11-1] in directory [proxy/proxy/].
Changes since yum-rhn-plugin-1.3.4-1:
Tomas Lestach (1):
Automatic commit of package [spacewalk-proxy] release [1.3.11-1].
---
proxy/proxy/spacewalk-proxy.spec | 8 +++++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
---
13 years, 3 months
proxy/proxy rel-eng/packages
by Tomas Lestach
proxy/proxy/spacewalk-proxy.spec | 8 +++++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit b6db0ba40affd581d1a41ceaf5c8cdd3111666ec
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 20 17:50:04 2011 +0100
Automatic commit of package [spacewalk-proxy] release [1.3.11-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 819faab..383eaab 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.3.10
+Version: 1.3.11
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -331,6 +331,12 @@ fi
%changelog
+* Thu Jan 20 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.11-1
+- updating Copyright years for year 2011 (tlestach(a)redhat.com)
+- remove redundant comment (msuchy(a)redhat.com)
+- convert comment to docstring (msuchy(a)redhat.com)
+- remove redundant comment (msuchy(a)redhat.com)
+
* Thu Jan 13 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.3.10-1
- do not traceback if redirected location do not contain '?'
- fix module name during import
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index cf4eec8..ca24023 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.3.10-1 proxy/proxy/
+1.3.11-1 proxy/proxy/
13 years, 3 months