fix conflict with master branch

Change-Id: I57cb6adf80b8a840c0cde3fc0278690daa4771b4
Signed-off-by: wang biao <biao716.wang@samsung.com>

diff --cc gitbuildsys/utils.py
Simple merge

diff --cc tests/test_passwdx.py
index 2d31baf9ac80f00d7d42408f7895e7390d1c2846,59d5a860d46c1289f0cd8ba19f4fca27d3605959..56c0d862cfb986c4045bc601f3ca9a6175423c08
--- 1/tests/test_passwdx.py
--- 2/tests/test_passwdx.py
+++ b/tests/test_passwdx.py
@@@ -152,8 -158,8 +158,8 @@@ class AutoGenerateTest(unittest.TestCas
      'test auto generation if no conf was found'
  
      @Fixture()
 -    def test_auto_generate_conf(self, fake_open, _fake_chmod):
 +    def test_auto_generate_conf_pos1(self, fake_open, _fake_chmod):
-         'test auto generate conf should contain obs and repos'
+         'test auto generate conf should contain repos'
          conf = FakeFile()
          fake_open.return_value = conf