[Python-modules-commits] [parallax] 05/08: merge patched into master
Valentin Vidic
vvidic-guest at moszumanska.debian.org
Tue Nov 28 08:39:55 UTC 2017
This is an automated email from the git hooks/post-receive script.
vvidic-guest pushed a commit to branch master
in repository parallax.
commit 760c91b827a4a64ed0caef0da8aefa19e73920f5
Merge: 19ef1d7 d512289
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date: Tue Nov 28 08:57:24 2017 +0100
merge patched into master
PKG-INFO | 3 +-
debian/.git-dpm | 6 +--
...-parallax.egg-info-from-the-master-branch.patch | 13 +++---
.../patches/0002-Fix-super-call-for-python2.patch | 22 ++++++++++
debian/patches/series | 1 +
parallax/__init__.py | 22 +++++++---
parallax/askpass_client.py | 26 +++++++-----
parallax/askpass_server.py | 1 +
parallax/color.py | 48 ++++++++++++++++++----
parallax/manager.py | 11 ++---
parallax/task.py | 8 ++--
parallax/version.py | 2 +-
12 files changed, 115 insertions(+), 48 deletions(-)
diff --cc debian/.git-dpm
index cce61e7,0000000..b9e6cfb
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,12 -1,0 +1,12 @@@
+# see git-dpm(1) from git-dpm package
- 42c640d038d6e0bfc18137f9ccb5f50c32071d59
- 42c640d038d6e0bfc18137f9ccb5f50c32071d59
- 628f08d1bcf5e372db15017ef5adbcc4be05f901
++d5122890cc2509686b1bb9aa82e1b7c2c8b26e72
++d5122890cc2509686b1bb9aa82e1b7c2c8b26e72
++15ecea8d24389474b2f488522e66800ec06c1e4a
+15ecea8d24389474b2f488522e66800ec06c1e4a
+parallax_1.0.3.orig.tar.gz
+a77ce1f9d104dfd4b53f8579207b8995d97a0f90
+16619
+
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Drop-parallax.egg-info-from-the-master-branch.patch
index 59c6356,0000000..5b98dba
mode 100644,000000..100644
--- a/debian/patches/0001-Drop-parallax.egg-info-from-the-master-branch.patch
+++ b/debian/patches/0001-Drop-parallax.egg-info-from-the-master-branch.patch
@@@ -1,93 -1,0 +1,94 @@@
- From 42c640d038d6e0bfc18137f9ccb5f50c32071d59 Mon Sep 17 00:00:00 2001
++From d5fa2c0bdfb12f5b7fc339d1bde223e89bae81b3 Mon Sep 17 00:00:00 2001
+From: Valentin Vidic <Valentin.Vidic at CARNet.hr>
+Date: Thu, 28 Sep 2017 10:28:35 +0200
+Subject: Drop parallax.egg-info from the master branch
+
+---
- parallax.egg-info/PKG-INFO | 29 -----------------------------
++ parallax.egg-info/PKG-INFO | 30 ------------------------------
+ parallax.egg-info/SOURCES.txt | 21 ---------------------
+ parallax.egg-info/dependency_links.txt | 1 -
+ parallax.egg-info/top_level.txt | 1 -
- 4 files changed, 52 deletions(-)
++ 4 files changed, 53 deletions(-)
+ delete mode 100644 parallax.egg-info/PKG-INFO
+ delete mode 100644 parallax.egg-info/SOURCES.txt
+ delete mode 100644 parallax.egg-info/dependency_links.txt
+ delete mode 100644 parallax.egg-info/top_level.txt
+
+diff --git a/parallax.egg-info/PKG-INFO b/parallax.egg-info/PKG-INFO
+deleted file mode 100644
- index b45ff60..0000000
++index 6e489f3..0000000
+--- a/parallax.egg-info/PKG-INFO
++++ /dev/null
- @@ -1,29 +0,0 @@
++@@ -1,30 +0,0 @@
+-Metadata-Version: 1.1
+-Name: parallax
- -Version: 1.0.2
++-Version: 1.0.3
+-Summary: Execute commands and copy files over SSH to multiple machines at once
+-Home-page: https://github.com/krig/parallax/
+-Author: Kristoffer Gronlund
+-Author-email: krig at koru.se
+-License: BSD
++-Description-Content-Type: UNKNOWN
+-Description: Parallax SSH provides an interface to executing commands on multiple
+- nodes at once using SSH. It also provides commands for sending and receiving files to
+- multiple nodes using SCP.
+-Platform: linux
+-Classifier: Development Status :: 3 - Alpha
+-Classifier: Intended Audience :: System Administrators
+-Classifier: License :: OSI Approved :: BSD License
+-Classifier: Operating System :: POSIX
+-Classifier: Programming Language :: Python
+-Classifier: Programming Language :: Python :: 2
+-Classifier: Programming Language :: Python :: 2.6
+-Classifier: Programming Language :: Python :: 2.7
+-Classifier: Programming Language :: Python :: 3
+-Classifier: Programming Language :: Python :: 3.1
+-Classifier: Programming Language :: Python :: 3.2
+-Classifier: Programming Language :: Python :: 3.3
+-Classifier: Programming Language :: Python :: 3.4
+-Classifier: Topic :: Software Development :: Libraries :: Python Modules
+-Classifier: Topic :: System :: Clustering
+-Classifier: Topic :: System :: Networking
+-Classifier: Topic :: System :: Systems Administration
+diff --git a/parallax.egg-info/SOURCES.txt b/parallax.egg-info/SOURCES.txt
+deleted file mode 100644
+index 0650cc7..0000000
+--- a/parallax.egg-info/SOURCES.txt
++++ /dev/null
+@@ -1,21 +0,0 @@
+-AUTHORS
+-COPYING
+-MANIFEST.in
+-README
+-README.md
+-setup.py
+-bin/parallax-askpass
+-parallax/__init__.py
+-parallax/askpass_client.py
+-parallax/askpass_server.py
+-parallax/callbacks.py
+-parallax/color.py
+-parallax/manager.py
+-parallax/psshutil.py
+-parallax/task.py
+-parallax/version.py
+-parallax.egg-info/PKG-INFO
+-parallax.egg-info/SOURCES.txt
+-parallax.egg-info/dependency_links.txt
+-parallax.egg-info/top_level.txt
+-test/test_api.py
+\ No newline at end of file
+diff --git a/parallax.egg-info/dependency_links.txt b/parallax.egg-info/dependency_links.txt
+deleted file mode 100644
+index 8b13789..0000000
+--- a/parallax.egg-info/dependency_links.txt
++++ /dev/null
+@@ -1 +0,0 @@
+-
+diff --git a/parallax.egg-info/top_level.txt b/parallax.egg-info/top_level.txt
+deleted file mode 100644
+index 4c7c9ef..0000000
+--- a/parallax.egg-info/top_level.txt
++++ /dev/null
+@@ -1 +0,0 @@
+-parallax
diff --cc debian/patches/0002-Fix-super-call-for-python2.patch
index 0000000,0000000..4113cb1
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Fix-super-call-for-python2.patch
@@@ -1,0 -1,0 +1,22 @@@
++From d5122890cc2509686b1bb9aa82e1b7c2c8b26e72 Mon Sep 17 00:00:00 2001
++From: Valentin Vidic <Valentin.Vidic at CARNet.hr>
++Date: Tue, 28 Nov 2017 08:57:14 +0100
++Subject: Fix super call for python2
++
++---
++ parallax/__init__.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/parallax/__init__.py b/parallax/__init__.py
++index bdedbc8..071068f 100644
++--- a/parallax/__init__.py
+++++ b/parallax/__init__.py
++@@ -61,7 +61,7 @@ class Error(BaseException):
++ that host.
++ """
++ def __init__(self, msg, task):
++- super().__init__(self)
+++ super(BaseException, self).__init__()
++ self.msg = msg
++ self.task = task
++
diff --cc debian/patches/series
index 3f61536,0000000..39c15ab
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
+0001-Drop-parallax.egg-info-from-the-master-branch.patch
++0002-Fix-super-call-for-python2.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/parallax.git
More information about the Python-modules-commits
mailing list