summaryrefslogtreecommitdiff
path: root/apt/cdrom.py
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2009-06-04 18:54:50 +0200
committerJulian Andres Klode <jak@debian.org>2009-06-04 18:54:50 +0200
commitcdabff6d329baba8024224b362f79d822ddd943e (patch)
tree66417ca63d9a7a29afb39350e23dd1b7ce3073b8 /apt/cdrom.py
parent75567ebb307ea8cdc9a7c36d8d5a9beb3aca1aa6 (diff)
downloadpython-apt-cdabff6d329baba8024224b362f79d822ddd943e.tar.gz
apt, aptsources, doc: Update to use the new names.
Diffstat (limited to 'apt/cdrom.py')
-rw-r--r--apt/cdrom.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/apt/cdrom.py b/apt/cdrom.py
index b9625ebf..a98b5d99 100644
--- a/apt/cdrom.py
+++ b/apt/cdrom.py
@@ -52,20 +52,20 @@ class Cdrom(object):
self._progress = progress
# see if we have a alternative mountpoint
if mountpoint is not None:
- apt_pkg.Config.Set("Acquire::cdrom::mount", mountpoint)
+ apt_pkg.config.set("Acquire::cdrom::mount", mountpoint)
# do not mess with mount points by default
if nomount:
- apt_pkg.Config.Set("APT::CDROM::NoMount", "true")
+ apt_pkg.config.set("APT::CDROM::NoMount", "true")
else:
- apt_pkg.Config.Set("APT::CDROM::NoMount", "false")
+ apt_pkg.config.set("APT::CDROM::NoMount", "false")
def add(self):
"""Add cdrom to the sources.list."""
- return self._cdrom.Add(self._progress)
+ return self._cdrom.add(self._progress)
def ident(self):
"""Identify the cdrom."""
- (res, ident) = self._cdrom.Ident(self._progress)
+ (res, ident) = self._cdrom.ident(self._progress)
if res:
return ident
@@ -77,8 +77,8 @@ class Cdrom(object):
# FIXME: throw exception instead
return False
# Get a list of files
- src = glob.glob(apt_pkg.Config.FindDir("Dir::Etc::sourceparts") + '*')
- src.append(apt_pkg.Config.FindFile("Dir::Etc::sourcelist"))
+ src = glob.glob(apt_pkg.config.find_dir("Dir::Etc::sourceparts") + '*')
+ src.append(apt_pkg.config.find_file("Dir::Etc::sourcelist"))
# Check each file
for fname in src:
for line in open(fname):