From b0595235a2374451c3f899fb893ad989a74b04d1 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 11 Mar 2015 12:04:49 +1100 Subject: [PATCH] Don't use packaged unittest2 Let pip install unittest2; pip installation can conflict with the packaged version. Change-Id: Iec9b35174ac68ebf713cd7462d7b5a82583d6e22 Partial-Bug: #1430592 --- files/rpms-suse/general | 1 - files/rpms/general | 1 - 2 files changed, 2 deletions(-) diff --git a/files/rpms-suse/general b/files/rpms-suse/general index 7f4bbfb1b6..63cf14bd5b 100644 --- a/files/rpms-suse/general +++ b/files/rpms-suse/general @@ -16,7 +16,6 @@ openssl psmisc python-cmd2 # dist:opensuse-12.3 python-pylint -python-unittest2 screen tar tcpdump diff --git a/files/rpms/general b/files/rpms/general index cf406325e7..eac4ec36a7 100644 --- a/files/rpms/general +++ b/files/rpms/general @@ -14,7 +14,6 @@ libxml2-devel libxslt-devel psmisc pylint -python-unittest2 python-devel screen tar