Merge lp:~stefanor/ibid/apt-1020751 into lp:ibid

[Stefano Rivera]

Don't display long descriptions of APT packages. DDE no longer provides them.

[Max Rabkin (max-rabkin)]

review: Approve

[Ibid Branch Auto-Lander (ibid-tarmac)]

The attempt to merge lp:~stefanor/ibid/apt-1020751 into lp:ibid failed. Below is the output from the failed tests.

ibid.test.plugins.test_calc
  CalcTest
    test_basic ... [OK]
    test_too_big ... [OK]
ibid.test.plugins.test_conversions
  CurrencyConversionTest
    test_conversion ... [FAIL]
/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py:165: UserWarning: Unbuilt egg for setuptools [unknown version] (/usr/lib/python2.6/dist-packages)
  CurrencyLookupTest
    test_common_currencies ... [OK]
/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py:165: UserWarning: Unbuilt egg for setuptools [unknown version] (/usr/lib/python2.6/dist-packages)
    test_country ... [OK]
/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py:165: UserWarning: Unbuilt egg for setuptools [unknown version] (/usr/lib/python2.6/dist-packages)
    test_country_association ... [FAIL]
/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py:165: UserWarning: Unbuilt egg for setuptools [unknown version] (/usr/lib/python2.6/dist-packages)
    test_fallthrough ... [OK]
/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py:165: UserWarning: Unbuilt egg for setuptools [unknown version] (/usr/lib/python2.6/dist-packages)
    test_tld ... [FAIL]
/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py:165: UserWarning: Unbuilt egg for setuptools [unknown version] (/usr/lib/python2.6/dist-packages)
  UnihanTest
    test_simp_trad ... [OK]
/usr/lib/pymodules/python2.6/html5lib/treebuilders/soup.py:3: DeprecationWarning: BeautifulSoup 3.x (as of 3.1) is not fully compatible with html5lib and support will be removed in the future
/usr/lib/pymodules/python2.6/html5lib/treebuilders/soup.py:141: DataLossWarning: BeautifulSoup cannot represent elements in any namespace
/usr/lib/pymodules/python2.6/html5lib/treebuilders/soup.py:163: DataLossWarning: BeautifulSoup cannot represent elements in any namespace
ibid.test.plugins.test_core
  TestAddressed
    test_happy_prefix_names ... [OK]
    test_happy_suffix_names ... [OK]
    test_non_messages ... [OK]
    test_sad_prefix_names ... [OK]
    test_sad_suffix_names ... [OK]
    test_strip_punct ... [OK]
ibid.test.plugins.test_factoid
  FactoidTest
    test_also ... [OK]
    test_append ... [OK]
    test_duplicate_names ... [OK]
    test_empty ... ...

[Keegan Carruthers-Smith (keegan-csmith)]

review: Approve

=== modified file 'ibid/plugins/sysadmin.py'
--- ibid/plugins/sysadmin.py	2010-06-14 19:59:21 +0000
+++ ibid/plugins/sysadmin.py	2012-07-03 21:44:19 +0000
@@ -75,9 +75,7 @@
             event.addresponse(u"Sorry, I couldn't find anything of that name. "
                               u"Is it a binary package?")
             return
-        event.addresponse(u'%(package)s %(version)s: %(description)s: '
-                          u'%(long_description)s',
-                          result)
+        event.addresponse(u'%(package)s %(version)s: %(description)s', result)
 
 features['apt-file'] = {
     'description': u'Searches for packages containing the specified file',