Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Please unblock waagent/2.2.2-2.

* Make sure tests packages is not included.

Fix is already included in jessie-backports, as it does not build
otherwise.

* Fix deprovision. (closes: #860019)

The deprovision command seems to be more widely used than I anticipated.
Microsoft would like to see this fix in the released image.

Please age the upload a bit, as I don't want to use other exceptions to
get this into the released image via jessie-backports.

diff --git a/debian/changelog b/debian/changelog
index cfd3976..2954cfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+waagent (2.2.2-2) unstable; urgency=medium
+
+  * Make sure tests packages is not included.
+  * Fix deprovision. (closes: #860019)
+
+ -- Bastian Blank <bastian.bl...@credativ.de>  Mon, 10 Apr 2017 13:14:40 +0200
+
 waagent (2.2.2-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/debian/patches/osutil-debian.patch 
b/debian/patches/osutil-debian.patch
index b4b45c0..9541edf 100644
--- a/debian/patches/osutil-debian.patch
+++ b/debian/patches/osutil-debian.patch
@@ -1,4 +1,4 @@
-From c84b6d8f19897ad0d098d6da7be452610c89d49b Mon Sep 17 00:00:00 2001
+From 26bdc9353c88b765868e9903f879439bf1094aec Mon Sep 17 00:00:00 2001
 From: Bastian Blank <bastian.bl...@credativ.de>
 Date: Wed, 24 Aug 2016 16:25:56 +0200
 Subject: Support Debian in osutil
@@ -9,7 +9,7 @@ Patch-Name: osutil-debian.patch
  1 file changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/azurelinuxagent/common/osutil/debian.py 
b/azurelinuxagent/common/osutil/debian.py
-index f455572..b204f4a 100644
+index f455572..5977572 100644
 --- a/azurelinuxagent/common/osutil/debian.py
 +++ b/azurelinuxagent/common/osutil/debian.py
 @@ -37,11 +37,22 @@ class DebianOSUtil(DefaultOSUtil):
@@ -21,11 +21,11 @@ index f455572..b204f4a 100644
  
      def stop_agent_service(self):
 -        return shellutil.run("service azurelinuxagent stop", chk_err=False)
-+        raise NotImplementedError
++        return shellutil.run("systemctl --job-mode=ignore-dependencies stop 
walinuxagent", chk_err=False)
  
      def start_agent_service(self):
 -        return shellutil.run("service azurelinuxagent start", chk_err=False)
-+        raise NotImplementedError
++        return shellutil.run("systemctl --job-mode=ignore-dependencies start 
walinuxagent", chk_err=False)
  
 +    def start_network(self):
 +        raise NotImplementedError
diff --git a/debian/rules b/debian/rules
index fd0c7c7..9bcd732 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,7 @@ export PYBUILD_INSTALL_ARGS=--install-scripts /usr/sbin
 override_dh_auto_install:
        dh_auto_install
        rm -r debian/waagent/etc/rc.d
+       rm -rf debian/waagent/usr/lib/python3*/dist-packages/tests/
 
 override_dh_auto_clean:
        dh_auto_clean

unblock waagent/2.2.2-2

-- System Information:
Debian Release: 9.0
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 
'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Reply via email to