Skip to content

Commit f840ae4

Browse files
committed
Merge branch 'master' of github.com:postgrespro/pg_probackup
2 parents 17251d6 + 7075432 commit f840ae4

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ Installers are available in release **assets**. [Latests](https://github.com/pos
7272
#### pg_probackup for vanilla PostgreSQL
7373
```shell
7474
#DEB Ubuntu|Debian Packages
75-
sudo echo "deb [arch=amd64] https://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" > /etc/apt/sources.list.d/pg_probackup.list
75+
sudo sh -c 'echo "deb [arch=amd64] https://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" > /etc/apt/sources.list.d/pg_probackup.list'
7676
sudo wget -O - https://repo.postgrespro.ru/pg_probackup/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
7777
sudo apt-get install pg-probackup-{13,12,11,10,9.6,9.5}
7878
sudo apt-get install pg-probackup-{13,12,11,10,9.6,9.5}-dbg
7979

8080
#DEB-SRC Packages
81-
sudo echo "deb-src [arch=amd64] https://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" >>\
82-
/etc/apt/sources.list.d/pg_probackup.list && sudo apt-get update
81+
sudo sh -c 'echo "deb-src [arch=amd64] https://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" >>\
82+
/etc/apt/sources.list.d/pg_probackup.list' && sudo apt-get update
8383
sudo apt-get source pg-probackup-{13,12,11,10,9.6,9.5}
8484

8585
#RPM Centos Packages
@@ -109,19 +109,19 @@ zypper install pg_probackup-{13,12,11,10,9.6,9.5}-debuginfo
109109
zypper si pg_probackup-{13,12,11,10,9.6,9.5}
110110

111111
#RPM ALT Linux 7
112-
sudo echo "rpm https://repo.postgrespro.ru/pg_probackup/rpm/latest/altlinux-p7 x86_64 vanilla" > /etc/apt/sources.list.d/pg_probackup.list
112+
sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup/rpm/latest/altlinux-p7 x86_64 vanilla" > /etc/apt/sources.list.d/pg_probackup.list'
113113
sudo apt-get update
114114
sudo apt-get install pg_probackup-{13,12,11,10,9.6,9.5}
115115
sudo apt-get install pg_probackup-{13,12,11,10,9.6,9.5}-debuginfo
116116

117117
#RPM ALT Linux 8
118-
sudo echo "rpm https://repo.postgrespro.ru/pg_probackup/rpm/latest/altlinux-p8 x86_64 vanilla" > /etc/apt/sources.list.d/pg_probackup.list
118+
sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup/rpm/latest/altlinux-p8 x86_64 vanilla" > /etc/apt/sources.list.d/pg_probackup.list'
119119
sudo apt-get update
120120
sudo apt-get install pg_probackup-{13,12,11,10,9.6,9.5}
121121
sudo apt-get install pg_probackup-{13,12,11,10,9.6,9.5}-debuginfo
122122

123123
#RPM ALT Linux 9
124-
sudo echo "rpm https://repo.postgrespro.ru/pg_probackup/rpm/latest/altlinux-p9 x86_64 vanilla" > /etc/apt/sources.list.d/pg_probackup.list
124+
sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup/rpm/latest/altlinux-p9 x86_64 vanilla" > /etc/apt/sources.list.d/pg_probackup.list'
125125
sudo apt-get update
126126
sudo apt-get install pg_probackup-{13,12,11,10,9.6,9.5}
127127
sudo apt-get install pg_probackup-{13,12,11,10,9.6,9.5}-debuginfo
@@ -130,7 +130,7 @@ sudo apt-get install pg_probackup-{13,12,11,10,9.6,9.5}-debuginfo
130130
#### pg_probackup for PostgresPro Standard and Enterprise
131131
```shell
132132
#DEB Ubuntu|Debian Packages
133-
sudo echo "deb [arch=amd64] https://repo.postgrespro.ru/pg_probackup-forks/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" > /etc/apt/sources.list.d/pg_probackup-forks.list
133+
sudo sh -c 'echo "deb [arch=amd64] https://repo.postgrespro.ru/pg_probackup-forks/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" > /etc/apt/sources.list.d/pg_probackup-forks.list'
134134
sudo wget -O - https://repo.postgrespro.ru/pg_probackup-forks/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
135135
sudo apt-get install pg-probackup-{std,ent}-{12,11,10,9.6}
136136
sudo apt-get install pg-probackup-{std,ent}-{12,11,10,9.6}-dbg
@@ -151,19 +151,19 @@ yum install pg_probackup-{std,ent}-{12,11,10,9.6}
151151
yum install pg_probackup-{std,ent}-{12,11,10,9.6}-debuginfo
152152

153153
#RPM ALT Linux 7
154-
sudo echo "rpm https://repo.postgrespro.ru/pg_probackup-forks/rpm/latest/altlinux-p7 x86_64 forks" > /etc/apt/sources.list.d/pg_probackup_forks.list
154+
sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup-forks/rpm/latest/altlinux-p7 x86_64 forks" > /etc/apt/sources.list.d/pg_probackup_forks.list'
155155
sudo apt-get update
156156
sudo apt-get install pg_probackup-{std,ent}-{12,11,10,9.6}
157157
sudo apt-get install pg_probackup-{std,ent}-{12,11,10,9.6}-debuginfo
158158

159159
#RPM ALT Linux 8
160-
sudo echo "rpm https://repo.postgrespro.ru/pg_probackup-forks/rpm/latest/altlinux-p8 x86_64 forks" > /etc/apt/sources.list.d/pg_probackup_forks.list
160+
sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup-forks/rpm/latest/altlinux-p8 x86_64 forks" > /etc/apt/sources.list.d/pg_probackup_forks.list'
161161
sudo apt-get update
162162
sudo apt-get install pg_probackup-{std,ent}-{12,11,10,9.6}
163163
sudo apt-get install pg_probackup-{std,ent}-{12,11,10,9.6}-debuginfo
164164

165165
#RPM ALT Linux 9
166-
sudo echo "rpm https://repo.postgrespro.ru/pg_probackup-forks/rpm/latest/altlinux-p9 x86_64 forks" > /etc/apt/sources.list.d/pg_probackup_forks.list && sudo apt-get update
166+
sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup-forks/rpm/latest/altlinux-p9 x86_64 forks" > /etc/apt/sources.list.d/pg_probackup_forks.list' && sudo apt-get update
167167
sudo apt-get install pg_probackup-{std,ent}-{12,11,10,9.6}
168168
sudo apt-get install pg_probackup-{std,ent}-{12,11,10,9.6}-debuginfo
169169
```

src/ptrack.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@ get_ptrack_version(PGconn *backup_conn, PGNodeInfo *nodeInfo)
201201
nodeInfo->ptrack_version_num = 20;
202202
else if (strcmp(ptrack_version_str, "2.1") == 0)
203203
nodeInfo->ptrack_version_num = 21;
204+
else if (strcmp(ptrack_version_str, "2.2") == 0)
205+
nodeInfo->ptrack_version_num = 22;
204206
else
205207
elog(WARNING, "Update your ptrack to the version 2.1 or upper. Current version is %s",
206208
ptrack_version_str);

0 commit comments

Comments
 (0)