From d064ab0bffd429382ea4fafeb144784d403848bd Mon Sep 17 00:00:00 2001
From: Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>
Date: Mon, 16 Jan 2017 10:10:41 +0100
Subject: Import patches-unapplied version 2.2.2-0ubuntu1 to
 ubuntu/zesty-proposed

Imported using git-ubuntu import.

Changelog parent: 63d399807de30a64456e672063e7c20babf7aadc

New changelog entries:
  * New upstream release (LP: #1651128)
    - d/patches/fix-auto-update.patch,
      d/patches/lp1623570-adjust-walinuxagent-service-after-and-wants.patch:
      - Dropped as changes have been applied upstream
    - Refreshed debian/patches/disable_import_test.patch
---
 snappy/bin/waagent | 49 -------------------------------------------------
 1 file changed, 49 deletions(-)
 delete mode 100755 snappy/bin/waagent

(limited to 'snappy/bin/waagent')

diff --git a/snappy/bin/waagent b/snappy/bin/waagent
deleted file mode 100755
index e65bc0c..0000000
--- a/snappy/bin/waagent
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env python
-#
-# Azure Linux Agent
-#
-# Copyright 2015 Microsoft Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Requires Python 2.6+ and Openssl 1.0+
-#
-# Implements parts of RFC 2131, 1541, 1497 and
-# http://msdn.microsoft.com/en-us/library/cc227282%28PROT.10%29.aspx
-# http://msdn.microsoft.com/en-us/library/cc227259%28PROT.13%29.aspx
-#
-
-import os
-import imp
-import sys
-
-if __name__ == '__main__' :
-    import azurelinuxagent.agent as agent
-    """
-    Invoke main method of agent
-    """
-    agent.main()
-
-if __name__ == 'waagent':
-    """
-    Load waagent2.0 to support old version of extensions
-    """
-    if sys.version_info[0] == 3:
-        raise ImportError("waagent2.0 doesn't support python3")
-    bin_path = os.path.dirname(os.path.abspath(__file__))
-    agent20_path = os.path.join(bin_path, "waagent2.0")
-    if not os.path.isfile(agent20_path):
-        raise ImportError("Can't load waagent")
-    agent20 = imp.load_source('waagent', agent20_path)
-    __all__ = dir(agent20)
-
-- 
cgit v1.2.3