Revision e083e94c snf-deploy/fabfile.py

b/snf-deploy/fabfile.py
77 77
    APT_GET = "export DEBIAN_FRONTEND=noninteractive ;apt-get install -y --force-yes "
78 78

  
79 79
    host_info = env.env.ips_info[env.host]
80
    env.env.update_packages(host_info.os)
80 81
    if ast.literal_eval(env.env.use_local_packages):
81 82
        with settings(warn_only=True):
82 83
            deb = local("ls %s/%s*%s_all.deb" % (env.env.packages, package, host_info.os))
83 84
            if deb:
84 85
                debug(env.host, " * Package %s found in %s..." % (package, env.env.packages))
85 86
                put(deb, "/tmp/")
86
                try_run("dpkg -i /tmp/%s*deb || " % package + APT_GET + "-f")
87
                try_run("rm /tmp/%s*deb" % package)
87
                try_run("dpkg -i /tmp/%s || " % os.path.basename(deb) + APT_GET + "-f")
88
                try_run("rm /tmp/%s" % os.path.basename(deb))
88 89
                return
89 90

  
90 91
    info = getattr(env.env, package)
91
    if info in ["squeeze-backports", "stable", "testing", "unstable"]:
92
        if  info == "squeeze-backports" and host_info.os == "wheezy":
93
          info = host_info.os
92
    if info in ["squeeze-backports", "stable", "testing", "unstable", "wheezy"]:
94 93
        APT_GET += " -t %s %s " % (info, package)
95 94
    elif info:
96 95
        APT_GET += " %s=%s " % (package, info)

Also available in: Unified diff