subject:"\[pve\-devel\] \[PATCH 1\/4\] code cleanup and man"

Re: [pve-devel] [PATCH 1/4] code cleanup and man

2015-06-12 Thread Wolfgang Link


Sorry was my fault, ignore the patch series.
I will send the right one.

On 06/12/2015 11:17 AM, Dietmar Maurer wrote:

I am confused now:

applying: code cleanup and man
/home/dietmar/pve2-devel/pve-zsync/.git/rebase-apply/patch:142: 
trailing whitespace.


error: patch failed: pve-zsync:362
error: pve-zsync: patch does not apply
Patch failed at 0001 code cleanup and man


On 06/12/2015 10:55 AM, Wolfgang Link wrote:

Signed-off-by: Wolfgang Link 
---
  pve-zsync | 54 +-
  1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/pve-zsync b/pve-zsync
index 3c134ce..cd2a228 100644
--- a/pve-zsync
+++ b/pve-zsync
@@ -362,7 +362,7 @@ sub format_job {
  my ($job, $line) = @_;
  my $text = "";
  -if ($job->{state} eq "stoped") {
+if ($job->{state} eq "stopped") {
  $text = "#";
  }
  if ($line) {
@@ -508,7 +508,7 @@ sub sync {
  my ($source, $dest, $job, $param, $date) = @_;
($source->{old_snap},$source->{last_snap}) = 
snapshot_get($source, $dest, $param->{maxsnap}, $param->{name});

-print Dumper $source, $dest;
+
  eval{
  snapshot_add($source, $dest, $param->{name}, $date);
  @@ -888,7 +888,7 @@ sub disable_job {
  my ($param) = @_;
my $job = get_job($param);
-$job->{state} = "stoped";
+$job->{state} = "stopped";
  update_state($job);
  update_cron($job);
  }
@@ -1122,65 +1122,65 @@ pve-zsync help  [OPTIONS]
pve-zsync create -dest  -source  [OPTIONS]
  -  Create a sync Job
+Create a sync Job
  -  -dest  string
+-dest  string
the destination target is like [IP]:[/Path]
  -  -limit integer
+-limit integer
max sync speed in kBytes/s, default unlimited
  -  -maxsnap   string
+-maxsnap   string
how much snapshots will be kept before get erased, default 1
  -  -name  string
+-name  string
name of the sync job, if not set it is default
  -  -skip  boolean
+-skip  boolean
if this flag is set it will skip the first sync
  -  -sourcestring
+-sourcestring
the source can be an  or [IP:][/Path]
pve-zsync destroy -source  [OPTIONS]
  -  remove a sync Job from the scheduler
+remove a sync Job from the scheduler
  -  -name  string
+-name  string
name of the sync job, if not set it is default
  -  -sourcestring
+-sourcestring
the source can be an   or 
[IP:][/Path]

pve-zsync disable -source  [OPTIONS]
  -  pause a sync job
+pause a sync job
  -  -name  string
+-name  string
name of the sync job, if not set it is default
  -  -sourcestring
+-sourcestring
the source can be an   or 
[IP:][/Path]

pve-zsync enable -source  [OPTIONS]
  -  enable a syncjob and reset error
+enable a syncjob and reset error
  -  -name  string
+-name  string
name of the sync job, if not set it is default
  -  -sourcestring
+-sourcestring
the source can be an   or 
[IP:][/Path]

  pve-zsync list
@@ -1203,16 +1203,16 @@ pve-zsync sync -dest  -source 
 [OPTIONS]

max sync speed in kBytes/s, default unlimited
  - -maxsnap   integer
+-maxsnap   integer
how much snapshots will be kept before get erased, default 1
  - -name  string
+-name  string
name of the sync job, if not set it is default.
  It is only necessary if scheduler allready contains this 
source.

  -  -sourcestring
+-sourcestring
the source can be an  or [IP:][/Path]
  @@ -1233,10 +1233,14 @@ add sync job from local VM to remote ZFS 
Server

  pve-zsync create -source=100 -dest=192.168.1.2:zfspool
=head1 IMPORTANT FILES
+
+Cron jobs are stored at /etc/cron.d/pve-zsync
+
+The VM config get copied on the destination machine to /var/pve-zsync/
+
+The config is stored at /var/pve-zsync/
  -Where the cron jobs are stored /etc/cron.d/pve-zsync
-Where the VM config get copied on the destination machine 
/var/pve-zsync/

-Where the config is stored /var/pve-zsync/
+=head1 COPYRIGHT AND DISCLAIMER
Copyright (C) 2007-2015 Proxmox Server Solutions GmbH





___
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Re: [pve-devel] [PATCH 1/4] code cleanup and man

2015-06-12 Thread Dietmar Maurer


I am confused now:

applying: code cleanup and man
/home/dietmar/pve2-devel/pve-zsync/.git/rebase-apply/patch:142: trailing 
whitespace.


error: patch failed: pve-zsync:362
error: pve-zsync: patch does not apply
Patch failed at 0001 code cleanup and man


On 06/12/2015 10:55 AM, Wolfgang Link wrote:

Signed-off-by: Wolfgang Link 
---
  pve-zsync | 54 +-
  1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/pve-zsync b/pve-zsync
index 3c134ce..cd2a228 100644
--- a/pve-zsync
+++ b/pve-zsync
@@ -362,7 +362,7 @@ sub format_job {
  my ($job, $line) = @_;
  my $text = "";
  
-if ($job->{state} eq "stoped") {

+if ($job->{state} eq "stopped") {
$text = "#";
  }
  if ($line) {
@@ -508,7 +508,7 @@ sub sync {
my ($source, $dest, $job, $param, $date) = @_;
  
  	($source->{old_snap},$source->{last_snap}) = snapshot_get($source, $dest, $param->{maxsnap}, $param->{name});

-   print Dumper $source, $dest;
+
eval{
snapshot_add($source, $dest, $param->{name}, $date);
  
@@ -888,7 +888,7 @@ sub disable_job {

  my ($param) = @_;
  
  my $job = get_job($param);

-$job->{state} = "stoped";
+$job->{state} = "stopped";
  update_state($job);
  update_cron($job);
  }
@@ -1122,65 +1122,65 @@ pve-zsync help  [OPTIONS]
  
  pve-zsync create -dest  -source  [OPTIONS]
  
-  Create a sync Job

+Create a sync Job
  
-  -dest  string

+-dest  string
  
  		the destination target is like [IP]:[/Path]
  
-  -limit integer

+-limit integer
  
  		max sync speed in kBytes/s, default unlimited
  
-  -maxsnap   string

+-maxsnap   string
  
  		how much snapshots will be kept before get erased, default 1
  
-  -name  string

+-name  string
  
  		name of the sync job, if not set it is default
  
-  -skip  boolean

+-skip  boolean
  
  		if this flag is set it will skip the first sync
  
-  -sourcestring

+-sourcestring
  
  		the source can be an  or [IP:][/Path]
  
  pve-zsync destroy -source  [OPTIONS]
  
-  remove a sync Job from the scheduler

+remove a sync Job from the scheduler
  
-  -name  string

+-name  string
  
  		name of the sync job, if not set it is default
  
-  -sourcestring

+-sourcestring
  
  the source can be an   or [IP:][/Path]
  
  pve-zsync disable -source  [OPTIONS]
  
-  pause a sync job

+pause a sync job
  
-  -name  string

+-name  string
  
  		name of the sync job, if not set it is default
  
-  -sourcestring

+-sourcestring
  
  the source can be an   or [IP:][/Path]
  
  pve-zsync enable -source  [OPTIONS]
  
-  enable a syncjob and reset error

+enable a syncjob and reset error
  
-  -name  string

+-name  string
  
  		name of the sync job, if not set it is default
  
-  -sourcestring

+-sourcestring
  
  the source can be an   or [IP:][/Path]

  pve-zsync list
@@ -1203,16 +1203,16 @@ pve-zsync sync -dest  -source  [OPTIONS]
  
  		max sync speed in kBytes/s, default unlimited
  
- -maxsnap   integer

+-maxsnap   integer
  
  		how much snapshots will be kept before get erased, default 1
  
- -name  string

+-name  string
  
  		name of the sync job, if not set it is default.

It is only necessary if scheduler allready contains this source.
  
-  -sourcestring

+-sourcestring
  
  		the source can be an  or [IP:][/Path]
  
@@ -1233,10 +1233,14 @@ add sync job from local VM to remote ZFS Server

  pve-zsync create -source=100 -dest=192.168.1.2:zfspool
  
  =head1 IMPORTANT FILES

+
+Cron jobs are stored at /etc/cron.d/pve-zsync
+
+The VM config get copied on the destination machine to  /var/pve-zsync/
+
+The config is stored at /var/pve-zsync/
  
-Where the cron jobs are stored/etc/cron.d/pve-zsync

-Where the VM config get copied on the destination machine /var/pve-zsync/
-Where the config is stored/var/pve-zsync/
+=head1 COPYRIGHT AND DISCLAIMER
  
  Copyright (C) 2007-2015 Proxmox Server Solutions GmbH
  



___
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH 1/4] code cleanup and man

2015-06-12 Thread Wolfgang Link

Signed-off-by: Wolfgang Link 
---
 pve-zsync | 54 +-
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/pve-zsync b/pve-zsync
index 3c134ce..cd2a228 100644
--- a/pve-zsync
+++ b/pve-zsync
@@ -362,7 +362,7 @@ sub format_job {
 my ($job, $line) = @_;
 my $text = "";
 
-if ($job->{state} eq "stoped") {
+if ($job->{state} eq "stopped") {
$text = "#";
 }
 if ($line) {
@@ -508,7 +508,7 @@ sub sync {
my ($source, $dest, $job, $param, $date) = @_;
 
($source->{old_snap},$source->{last_snap}) = snapshot_get($source, 
$dest, $param->{maxsnap}, $param->{name});
-   print Dumper $source, $dest;
+
eval{
snapshot_add($source, $dest, $param->{name}, $date);
 
@@ -888,7 +888,7 @@ sub disable_job {
 my ($param) = @_;
 
 my $job = get_job($param);
-$job->{state} = "stoped";
+$job->{state} = "stopped";
 update_state($job);
 update_cron($job);
 }
@@ -1122,65 +1122,65 @@ pve-zsync help  [OPTIONS]
 
 pve-zsync create -dest  -source  [OPTIONS]
 
-  Create a sync Job
+Create a sync Job
 
-  -dest  string
+-dest  string
 
the destination target is like [IP]:[/Path]
 
-  -limit integer
+-limit integer
 
max sync speed in kBytes/s, default unlimited
 
-  -maxsnap   string
+-maxsnap   string
 
how much snapshots will be kept before get erased, default 1
 
-  -name  string
+-name  string
 
name of the sync job, if not set it is default
 
-  -skip  boolean
+-skip  boolean
 
if this flag is set it will skip the first sync
 
-  -sourcestring
+-sourcestring
 
the source can be an  or [IP:][/Path]
 
 pve-zsync destroy -source  [OPTIONS]
 
-  remove a sync Job from the scheduler
+remove a sync Job from the scheduler
 
-  -name  string
+-name  string
 
name of the sync job, if not set it is default
 
-  -sourcestring
+-sourcestring
 
 the source can be an   or [IP:][/Path]
 
 pve-zsync disable -source  [OPTIONS]
 
-  pause a sync job
+pause a sync job
 
-  -name  string
+-name  string
 
name of the sync job, if not set it is default
 
-  -sourcestring
+-sourcestring
 
 the source can be an   or [IP:][/Path]
 
 pve-zsync enable -source  [OPTIONS]
 
-  enable a syncjob and reset error
+enable a syncjob and reset error
 
-  -name  string
+-name  string
 
name of the sync job, if not set it is default
 
-  -sourcestring
+-sourcestring
 
 the source can be an   or [IP:][/Path]
 pve-zsync list
@@ -1203,16 +1203,16 @@ pve-zsync sync -dest  -source  [OPTIONS]
 
max sync speed in kBytes/s, default unlimited
 
- -maxsnap   integer
+-maxsnap   integer
 
how much snapshots will be kept before get erased, default 1
 
- -name  string
+-name  string
 
name of the sync job, if not set it is default.
It is only necessary if scheduler allready contains this source.
 
-  -sourcestring
+-sourcestring
 
the source can be an  or [IP:][/Path]
 
@@ -1233,10 +1233,14 @@ add sync job from local VM to remote ZFS Server
 pve-zsync create -source=100 -dest=192.168.1.2:zfspool
 
 =head1 IMPORTANT FILES
+ 
+Cron jobs are stored at /etc/cron.d/pve-zsync
+
+The VM config get copied on the destination machine to  /var/pve-zsync/
+
+The config is stored at /var/pve-zsync/
 
-Where the cron jobs are stored/etc/cron.d/pve-zsync
-Where the VM config get copied on the destination machine /var/pve-zsync/
-Where the config is stored/var/pve-zsync/
+=head1 COPYRIGHT AND DISCLAIMER
 
 Copyright (C) 2007-2015 Proxmox Server Solutions GmbH
 
-- 
2.1.4


___
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH 1/4] code cleanup and man

2015-06-11 Thread Wolfgang Link

Signed-off-by: Wolfgang Link 
---
 pve-zsync | 54 +-
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/pve-zsync b/pve-zsync
index 3c134ce..cd2a228 100644
--- a/pve-zsync
+++ b/pve-zsync
@@ -362,7 +362,7 @@ sub format_job {
 my ($job, $line) = @_;
 my $text = "";
 
-if ($job->{state} eq "stoped") {
+if ($job->{state} eq "stopped") {
$text = "#";
 }
 if ($line) {
@@ -508,7 +508,7 @@ sub sync {
my ($source, $dest, $job, $param, $date) = @_;
 
($source->{old_snap},$source->{last_snap}) = snapshot_get($source, 
$dest, $param->{maxsnap}, $param->{name});
-   print Dumper $source, $dest;
+
eval{
snapshot_add($source, $dest, $param->{name}, $date);
 
@@ -888,7 +888,7 @@ sub disable_job {
 my ($param) = @_;
 
 my $job = get_job($param);
-$job->{state} = "stoped";
+$job->{state} = "stopped";
 update_state($job);
 update_cron($job);
 }
@@ -1122,65 +1122,65 @@ pve-zsync help  [OPTIONS]
 
 pve-zsync create -dest  -source  [OPTIONS]
 
-  Create a sync Job
+Create a sync Job
 
-  -dest  string
+-dest  string
 
the destination target is like [IP]:[/Path]
 
-  -limit integer
+-limit integer
 
max sync speed in kBytes/s, default unlimited
 
-  -maxsnap   string
+-maxsnap   string
 
how much snapshots will be kept before get erased, default 1
 
-  -name  string
+-name  string
 
name of the sync job, if not set it is default
 
-  -skip  boolean
+-skip  boolean
 
if this flag is set it will skip the first sync
 
-  -sourcestring
+-sourcestring
 
the source can be an  or [IP:][/Path]
 
 pve-zsync destroy -source  [OPTIONS]
 
-  remove a sync Job from the scheduler
+remove a sync Job from the scheduler
 
-  -name  string
+-name  string
 
name of the sync job, if not set it is default
 
-  -sourcestring
+-sourcestring
 
 the source can be an   or [IP:][/Path]
 
 pve-zsync disable -source  [OPTIONS]
 
-  pause a sync job
+pause a sync job
 
-  -name  string
+-name  string
 
name of the sync job, if not set it is default
 
-  -sourcestring
+-sourcestring
 
 the source can be an   or [IP:][/Path]
 
 pve-zsync enable -source  [OPTIONS]
 
-  enable a syncjob and reset error
+enable a syncjob and reset error
 
-  -name  string
+-name  string
 
name of the sync job, if not set it is default
 
-  -sourcestring
+-sourcestring
 
 the source can be an   or [IP:][/Path]
 pve-zsync list
@@ -1203,16 +1203,16 @@ pve-zsync sync -dest  -source  [OPTIONS]
 
max sync speed in kBytes/s, default unlimited
 
- -maxsnap   integer
+-maxsnap   integer
 
how much snapshots will be kept before get erased, default 1
 
- -name  string
+-name  string
 
name of the sync job, if not set it is default.
It is only necessary if scheduler allready contains this source.
 
-  -sourcestring
+-sourcestring
 
the source can be an  or [IP:][/Path]
 
@@ -1233,10 +1233,14 @@ add sync job from local VM to remote ZFS Server
 pve-zsync create -source=100 -dest=192.168.1.2:zfspool
 
 =head1 IMPORTANT FILES
+ 
+Cron jobs are stored at /etc/cron.d/pve-zsync
+
+The VM config get copied on the destination machine to  /var/pve-zsync/
+
+The config is stored at /var/pve-zsync/
 
-Where the cron jobs are stored/etc/cron.d/pve-zsync
-Where the VM config get copied on the destination machine /var/pve-zsync/
-Where the config is stored/var/pve-zsync/
+=head1 COPYRIGHT AND DISCLAIMER
 
 Copyright (C) 2007-2015 Proxmox Server Solutions GmbH
 
-- 
2.1.4


___
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Re: [pve-devel] [PATCH 1/4] code cleanup and man

Re: [pve-devel] [PATCH 1/4] code cleanup and man

[pve-devel] [PATCH 1/4] code cleanup and man

[pve-devel] [PATCH 1/4] code cleanup and man

4 matches

Site Navigation

Mail list logo

Footer information