Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '0.31' into 0.32

Conflicts:
	lib/Rex.pm
	lib/Rex/TaskList.pm
  • Loading branch information...
commit f26ee3c39a2174abf828def138908c525e6c615f 2 parents 17512df + 946933d
@krimdomu authored
View
4 ChangeLog
@@ -1,3 +1,7 @@
+2012-08-16 Jan Gehring <jan.gehring, gmail.com> (0.31.5)
+ * fixed cli parameter bug (-G)
+ * fixed logging bug with %h
+
2012-08-04 Jan Gehring <jan.gehring, gmail.com> (0.31.0)
* fixed a bug for task with the no_ssh attribute
* added http transport layer
View
5 debian/changelog
@@ -1,3 +1,8 @@
+rex (0.31.5) unstable; urgency=low
+ * package updated
+
+ -- Jan Gehring <jan.gehring@gmail.com> Thu, 16 Aug 2012 20:00:00 +0200
+
rex (0.31.4) unstable; urgency=low
* package updated
View
7 doc/rex.spec
@@ -5,11 +5,11 @@
Summary: Rex is a tool to ease the execution of commands on multiple remote servers.
Name: rex
-Version: 0.31.4
+Version: 0.31.5
Release: 1
License: Apache 2.0
Group: Utilities/System
-Source: http://search.cpan.org/CPAN/authors/id/J/JF/JFRIED/Rex-0.31.4.tar.gz
+Source: http://search.cpan.org/CPAN/authors/id/J/JF/JFRIED/Rex-0.31.5.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: perl-Net-SSH2
@@ -59,5 +59,8 @@ find %{buildroot} -name .packlist -exec %{__rm} {} \;
%changelog
+* Thu Aug 16 2012 Jan Gehring <jan.gehring at, gmail.com> 0.31.5-1
+- updated release
+
* Sat Aug 04 2012 Jan Gehring <jan.gehring at, gmail.com> 0.31.4-1
- updated release
View
2  lib/Rex/Logger.pm
@@ -214,7 +214,7 @@ sub format_string {
my ($s, $level) = @_;
my $date = get_timestamp;
- my $host = Rex::get_current_connection() ? Rex::get_current_connection()->{server} : "<local>";
+ my $host = Rex::get_current_connection() ? Rex::get_current_connection()->{conn}->server : "<local>";
my $pid = $$;
my $line = $format;
View
5 lib/Rex/TaskList.pm
@@ -11,7 +11,12 @@ use warnings;
use Rex::Config;
use Rex::Logger;
+use Rex::Interface::Executor;
+use Rex::Fork::Manager;
+use vars qw(%tasks);
+
+# will be set from Rex::Transaction::transaction()
our $task_list = {};
sub create {
View
11 lib/Rex/TaskList/Base.pm
@@ -50,10 +50,15 @@ sub create_task {
if($::FORCE_SERVER) {
- my @servers = split(/\s+/, $::FORCE_SERVER);
- push(@server, map { Rex::Group::Entry::Server->new(name => $_); } @servers);
+ if($::FORCE_SERVER =~ m/^\0/) {
+ push(@server, map { Rex::Group::Entry::Server->new(name => $_); } Rex::Group->get_group(substr($::FORCE_SERVER, 1)));
+ }
+ else {
+ my @servers = split(/\s+/, $::FORCE_SERVER);
+ push(@server, map { Rex::Group::Entry::Server->new(name => $_); } @servers);
- Rex::Logger::debug("\tserver: $_") for @server;
+ Rex::Logger::debug("\tserver: $_") for @server;
+ }
}
Please sign in to comment.
Something went wrong with that request. Please try again.