Revision f1b4fdfc snf-deploy/fabfile.py

b/snf-deploy/fabfile.py
76 76
    debug(env.host, " * Installing package %s..." % package)
77 77
    APT_GET = "export DEBIAN_FRONTEND=noninteractive ;apt-get install -y --force-yes "
78 78

  
79
    host_info = env.env.ips_info[env.host]
79 80
    if ast.literal_eval(env.env.use_local_packages):
80 81
        with settings(warn_only=True):
81
            deb = local("ls %s/%s*deb" % (env.env.packages, package))
82
            deb = local("ls %s/%s*%s.deb" % (env.env.packages, package, host_info[os]))
82 83
            if deb:
83 84
                debug(env.host, " * Package %s found in %s..." % (package, env.env.packages))
84 85
                put(deb, "/tmp/")
......
87 88
                return
88 89

  
89 90
    info = getattr(env.env, package)
90
    if info in ["stable", "squeeze-backports", "testing", "unstable"]:
91
    if info in ["squeeze-backports", "stable", "testing", "unstable"]:
92
        if  info == "squeeze-backports" and host_infa.os = "wheezy":
93
          info = host_info.os
91 94
        APT_GET += " -t %s %s " % (info, package)
92 95
    elif info:
93 96
        APT_GET += " %s=%s " % (package, info)
......
358 361
    curl -k https://dev.grnet.gr/files/apt-grnetdev.pub | apt-key add -
359 362
    """
360 363
    try_run(cmd)
361
    tmpl = "/etc/apt/sources.list.d/okeanos.list"
364
    host_info = env.env.ips_info[env.host]
365
    if host_info.os == "squeeze":
366
      tmpl = "/etc/apt/sources.list.d/synnefo.squeeze.list"
367
    else:
368
      tmpl = "/etc/apt/sources.list.d/synnefo.wheezy.list"
362 369
    replace = {}
363 370
    custom = customize_settings_from_tmpl(tmpl, replace)
364 371
    put(custom, tmpl)

Also available in: Unified diff