← Back to branch summary

~ubuntu-branches/ubuntu/precise/hplip/precise-security

« back to all changes in this revision

Viewing changes to installer/core_install.py

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-02-18 13:56:10 UTC
  • mfrom: (30.1.1 precise)
  • Revision ID: package-import@ubuntu.com-20120218135610-c99yarrcb4rp0rid
Tags: 3.12.2-1
http://bugs.debian.org/658056
http://bugs.debian.org/645848
http://bugs.debian.org/623627
http://bugs.debian.org/600360
* New Upstream Release
* Fixup Replaces: for squeeze security updates (Closes: #658056)
  - Fixes "obsolete conffiles not removed on upgrades" (Closes: #645848)
* Cleanup Obsolete Replaces: Depends: Breaks: - support upgrades squeeze+
* Obtain user consent before running hp-check in reportbug
  - Fixes "bug script starts /usr/share/hplip/systray.py" (Closes: #623627)
* Drop legacy Uploaders
* Add hplip Depends: python-gobject-2
  - Fixes "missing dependency causes hp-plugin to fail" (Closes: #600360)

Show diffs side-by-side

added added

removed removed

Lines of Context:
installer/core_install.py
1188
1188
                    configuration['cups-ppd-install'] = True
1189
1189
 
1190
1190
        if self.ppd_dir is not None:
1191
 
            configure_cmd += ' --with-hpppddir=%s' % self.ppd_dir
 
1191
            configure_cmd += ' --with-hpppddir=%s' % self.ppd_dir
1192
1192
            
1193
1193
        libdir_path = self.get_distro_ver_data('libdir_path',False)
1194
 
        if libdir_path and self.bitness == 64:
 
1194
        if libdir_path and self.bitness == 64:
1195
1195
            configure_cmd += ' --libdir=%s' % (libdir_path)
1196
1196
        elif self.bitness == 64:
1197
1197
            configure_cmd += ' --libdir=/usr/lib64'
1862
1862
                wget = utils.which("wget")
1863
1863
                if wget:
1864
1864
                    wget = os.path.join(wget, "wget")
1865
 
                    status, output = self.run("%s --timeout=60 --output-document=%s %s" %(wget, local_conf, plugin_conf_url))
 
1865
                    status, output = self.run("%s --timeout=60 --output-document=%s %s --cache=off" %(wget, local_conf, plugin_conf_url))
1866
1866
                    if status:
1867
1867
                        log.error("Plugin download failed with error code = %d" %status)
1868
1868
                        return '', 0, 0, 0, False
1946
1946
        wget = utils.which("wget")
1947
1947
        if wget:
1948
1948
            wget = os.path.join(wget, "wget")
1949
 
            cmd = "%s %s" % (wget, url)
 
1949
            cmd = "%s --cache=off -P %s %s" % (wget,self.plugin_path,url)
1950
1950
            log.debug(cmd)
1951
1951
            status, output = self.run(cmd)
1952
1952
            log.debug("wget returned: %d" % status)
1955
1955
            if (status != 0) and 'file://' not in url:
1956
1956
                url = os.path.join(PLUGIN_FALLBACK_LOCATION, self.plugin_name)
1957
1957
                log.info("Plugin is not accessible. Trying to download it from fallback location: [%s]" % url)
1958
 
 
1959
 
            filename, headers = urllib.urlretrieve(url, plugin_file, callback)
 
1958
            cmd = "%s --cache=off -P %s %s" % (wget,self.plugin_path,url)
 
1959
            log.debug(cmd)
 
1960
            status, output = self.run(cmd)
 
1961
            #filename, headers = urllib.urlretrieve(url, plugin_file, callback)
1960
1962
        except IOError, e:
1961
1963
            log.error("Plug-in download failed: %s" % e.strerror)
1962
1964
            return PLUGIN_INSTALL_ERROR_PLUGIN_FILE_NOT_FOUND, e.strerror
1976
1978
        log.debug("Downloading %s plug-in digital signature file from '%s' to '%s'..." % (self.plugin_version, digsig_url, digsig_file))
1977
1979
 
1978
1980
        try:
1979
 
            filename, headers = urllib.urlretrieve(digsig_url, digsig_file, callback)
 
1981
            cmd = "%s --cache=off -P %s %s" % (wget,self.plugin_path,digsig_url)
 
1982
            log.debug(cmd)
 
1983
            status, output = self.run(cmd)
 
1984
            #filename, headers = urllib.urlretrieve(digsig_url, digsig_file, callback)
1980
1985
        except IOError, e:
1981
1986
            log.error("Plug-in GPG file [%s] download failed: %s" % (digsig_url,e.strerror))
1982
1987
            return PLUGIN_INSTALL_ERROR_DIGITAL_SIG_NOT_FOUND, e.strerror