Fixed bug #1240667: pin priority for cloud-tools

cloudinit/sshinit/configure.go

 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package sshinit
 
 import (
         "fmt"
         "io"
         "strings"
 
@@ skipping 123 matching lines @@
                 // PPA keys are obtained by add-apt-repository, from launchpad.
                 if !strings.HasPrefix(src.Source, "ppa:") {
                         if src.Key != "" {
                                 key := utils.ShQuote(src.Key)
                                 cmd := fmt.Sprintf("printf '%%s\\n' %s | apt-key add -", key)
                                 cmds = append(cmds, cmd)
                         }
                 }
                 cmds = append(cmds, cloudinit.LogProgressCmd("Adding apt repository: %s", src.Source))
                 cmds = append(cmds, "add-apt-repository -y "+utils.ShQuote(src.Source))
                 if src.Prefs != nil {

[axw, 2014/02/12 01:25:42]

Is there a good reason to duplicate this logic here and in cloudinit/options.go?
Anything that's not core cloud-init functionality should really belong in
environs/cloudinit.

[dimitern, 2014/02/12 08:49:36]

This is due to the fact that runcmds are run after everything else, as you
mentioned. So I had to pull it out here in order for it to work.

                         path := utils.ShQuote(src.Prefs.Path)
-                        contents := utils.ShQuote(fmt.Sprintf(
-                                cloudinit.AptPreferencesTemplate,
-                                src.Prefs.Explanation,
-                                src.Prefs.Package,
-                                src.Prefs.Pin,
-                                src.Prefs.PinPriority,
-                        ))
+                        contents := utils.ShQuote(src.Prefs.FileContents())
                         cmds = append(cmds, "install -D -m 644 /dev/null "+path)
                         cmds = append(cmds, `printf '%s\n' `+contents+` > `+path)
                 }
         }
         if len(cfg.AptSources()) > 0 || cfg.AptUpdate() {
                 cmds = append(cmds, cloudinit.LogProgressCmd("Running apt-get update"))
                 cmds = append(cmds, aptget+"update")
         }
         if cfg.AptUpgrade() {
                 cmds = append(cmds, cloudinit.LogProgressCmd("Running apt-get upgrade"))
@@ skipping 28 matching lines @@
                         }
                         result = append(result, strings.Join(cmd, " "))
                 case string:
                         result = append(result, cmd)
                 default:
                         return nil, fmt.Errorf("unexpected command type: %T", cmd)
                 }
         }
         return result, nil
 }