Merge lp:~funkyhat/ubuntu/maverick/software-properties/fix-594368 into lp:ubuntu/maverick/software-properties

[Matt Wheeler]

This fixes #594368 (as far as I'm aware!) by simply replacing the attributes as suggested by the deprecation warnings.

I have tested the resulting package after building with pbuilder and add-apt-repository appears to be working flawlessly.

[James Westby (james-w)]

Also see

  https://code.launchpad.net/~erik-b-andersen/software-properties/main/+merge/27464

Thanks,

James

[Matt Wheeler (funkyhat)]

On 15 June 2010 12:45, James Westby <email address hidden> wrote:
> Also see
>
>  https://code.launchpad.net/~erik-b-andersen/software-properties/main/+merge/27464

Oh, my searches on launchpad before I had a go at this didn't pick
that up. Sorry!

--
Matt Wheeler
<email address hidden>

[Michael Vogt (mvo)]

Thanks for this branch! This is in bzr now:

software-properties (0.76.6) maverick; urgency=low
..
  * fix deprecation warnings from python-apt 0.8

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-14 20:59:41 +0000
+++ debian/changelog	2010-06-14 22:50:40 +0000
@@ -1,3 +1,10 @@
+software-properties (0.75.11) maverick; urgency=low
+
+  * Replaced instances of deprecated attributes in ppa.py and
+    SoftwareProperties.py (LP: #594368)
+
+ -- Matt Wheeler <[e-mail]>  Mon, 14 Jun 2010 23:27:42 +0100
+
 software-properties (0.75.10) lucid; urgency=low
 
   * softwareproperties/ppa.py:

=== modified file 'softwareproperties/SoftwareProperties.py'
--- softwareproperties/SoftwareProperties.py	2010-03-26 13:51:20 +0000
+++ softwareproperties/SoftwareProperties.py	2010-06-14 22:50:40 +0000
@@ -111,7 +111,7 @@
     """Backup all apt configuration options"""
     self.apt_conf_backup = {}
     for option in softwareproperties.CONF_MAP.keys():
-        value = apt_pkg.Config.FindI(softwareproperties.CONF_MAP[option])
+        value = apt_pkg.Config.find_i(softwareproperties.CONF_MAP[option])
         self.apt_conf_backup[option] = value
 
   def restore_apt_conf(self):
@@ -125,21 +125,21 @@
     """ Parse the apt cron configuration. Try to fit a predefined use case 
         and return it. Special case: if the user made a custom 
         configurtation, that we cannot represent it will return None """
-    if apt_pkg.Config.FindI(softwareproperties.CONF_MAP["autoupdate"]) > 0:
+    if apt_pkg.Config.find_i(softwareproperties.CONF_MAP["autoupdate"]) > 0:
         # Autodownload
-        if apt_pkg.Config.FindI(softwareproperties.CONF_MAP["unattended"]) == 1\
-           and apt_pkg.Config.FindI(softwareproperties.CONF_MAP["autodownload"]) == 1 :
+        if apt_pkg.Config.find_i(softwareproperties.CONF_MAP["unattended"]) == 1\
+           and apt_pkg.Config.find_i(softwareproperties.CONF_MAP["autodownload"]) == 1 :
             return softwareproperties.UPDATE_INST_SEC
-        elif apt_pkg.Config.FindI(softwareproperties.CONF_MAP["autodownload"]) == 1 and  \
-             apt_pkg.Config.FindI(softwareproperties.CONF_MAP["unattended"]) == 0:
+        elif apt_pkg.Config.find_i(softwareproperties.CONF_MAP["autodownload"]) == 1 and  \
+             apt_pkg.Config.find_i(softwareproperties.CONF_MAP["unattended"]) == 0:
             return softwareproperties.UPDATE_DOWNLOAD
-        elif apt_pkg.Config.FindI(softwareproperties.CONF_MAP["unattended"]) == 0 and \
-             apt_pkg.Config.FindI(softwareproperties.CONF_MAP["autodownload"]) == 0:
+        elif apt_pkg.Config.find_i(softwareproperties.CONF_MAP["unattended"]) == 0 and \
+             apt_pkg.Config.find_i(softwareproperties.CONF_MAP["autodownload"]) == 0:
             return softwareproperties.UPDATE_NOTIFY
         else:
             return None
-    elif apt_pkg.Config.FindI(softwareproperties.CONF_MAP["unattended"]) == 0 and \
-         apt_pkg.Config.FindI(softwareproperties.CONF_MAP["autodownload"]) == 0:
+    elif apt_pkg.Config.find_i(softwareproperties.CONF_MAP["unattended"]) == 0 and \
+         apt_pkg.Config.find_i(softwareproperties.CONF_MAP["autodownload"]) == 0:
         return softwareproperties.UPDATE_MANUAL
     else:
         return None
@@ -167,13 +167,13 @@
   def set_update_interval(self, days):
       """Set the interval in which we check for available updates"""
       # Only write the key if it has changed
-      if not days == apt_pkg.Config.FindI(softwareproperties.CONF_MAP["autoupdate"]):
+      if not days == apt_pkg.Config.find_i(softwareproperties.CONF_MAP["autoupdate"]):
           apt_pkg.Config.Set(softwareproperties.CONF_MAP["autoupdate"], str(days))
           self.set_modified_config()
 
   def get_update_interval(self):
     """ Returns the interval of the apt periodic cron job """
-    return apt_pkg.Config.FindI(softwareproperties.CONF_MAP["autoupdate"])
+    return apt_pkg.Config.find_i(softwareproperties.CONF_MAP["autoupdate"])
 
   def get_release_upgrades_policy(self):
     """
@@ -579,7 +579,7 @@
 
         # and append the updated keys
         for i in cnf.List():
-          f.write("APT::Periodic::%s \"%s\";\n" % (i, cnf.FindI(i)))
+          f.write("APT::Periodic::%s \"%s\";\n" % (i, cnf.find_i(i)))
         f.close()    
 
   def save_sourceslist(self):

=== modified file 'softwareproperties/ppa.py'
--- softwareproperties/ppa.py	2010-04-14 20:59:41 +0000
+++ softwareproperties/ppa.py	2010-06-14 22:50:40 +0000
@@ -40,7 +40,7 @@
         ppa_name = abrev.split("/")[1]
     except IndexError, e:
         ppa_name = "ppa"
-    sourceslistd = apt_pkg.Config.FindDir("Dir::Etc::sourceparts")
+    sourceslistd = apt_pkg.Config.find_dir("Dir::Etc::sourceparts")
     line = "deb http://ppa.launchpad.net/%s/%s/ubuntu %s main" % (
         ppa_owner, ppa_name, distro_codename)
     file = "%s/%s-%s-%s.list" % (