I tried to merge trunk and got conflicts. You should merge trunk again and fix them (in UpdateManager/Core/UpdateList.py).
Some details:
=== modified file 'UpdateManager/Core/UpdateList.py' --- UpdateManager/Core/UpdateList.py 2012-08-20 15:32:45 +0000 +++ UpdateManager/Core/UpdateList.py 2012-11-10 06:29:19 +0000 @@ -1,7 +1,7 @@ # UpdateList.py # -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- # -# Copyright (c) 2004-2012 Canonical +# Copyright (c) 2004-2008 Canonical
I think this shouldn't be modified.
# # Author: Michael Vogt <email address hidden> #
You modified this file a lot, I think your name should be here too. :)
@@ -22,53 +22,103 @@
from __future__ import print_function
+import warnings +warnings.filterwarnings("ignore", "Accessed deprecated property", + DeprecationWarning) + from gettext import gettext as _ - -import apt -import logging import operator -import random +import itertools import subprocess +import os +import glob import sys
What about alphabetical order here?
« Back to merge proposal
I tried to merge trunk and got conflicts. You should merge trunk again and fix them (in UpdateManager/ Core/UpdateList .py).
Some details:
=== modified file 'UpdateManager/ Core/UpdateList .py' Core/UpdateList .py 2012-08-20 15:32:45 +0000 Core/UpdateList .py 2012-11-10 06:29:19 +0000
--- UpdateManager/
+++ UpdateManager/
@@ -1,7 +1,7 @@
# UpdateList.py
# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
#
-# Copyright (c) 2004-2012 Canonical
+# Copyright (c) 2004-2008 Canonical
I think this shouldn't be modified.
#
# Author: Michael Vogt <email address hidden>
#
You modified this file a lot, I think your name should be here too. :)
@@ -22,53 +22,103 @@
from __future__ import print_function
+import warnings filterwarnings( "ignore" , "Accessed deprecated property",
+warnings.
+ DeprecationWarning)
+
from gettext import gettext as _
-
-import apt
-import logging
import operator
-import random
+import itertools
import subprocess
+import os
+import glob
import sys
What about alphabetical order here?