+ echo '====== automated-ec2-builds [/tmp/automated-ec2-builds] ======' ====== automated-ec2-builds [/tmp/automated-ec2-builds] ====== + cd /tmp/automated-ec2-builds + bzr info Standalone tree (format: 2a) Location: branch root: . Related branches: parent branch: http://bazaar.launchpad.net/~ubuntu-on-ec2/vmbuilder/automated-ec2-builds/ + bzr version-info revision-id: ben.howard@canonical.com-20140807111649-ljzuvwhnwmtfjss1 date: 2014-08-07 13:16:49 +0200 build-date: 2014-08-16 05:23:14 +0000 revno: 642 branch-nick: automated-ec2-builds + bzr log -p -r-1 ------------------------------------------------------------ revno: 642 committer: Ben Howard branch nick: automated-ec2-builds timestamp: Thu 2014-08-07 13:16:49 +0200 message: Use codecs.open for all file ops in license.py diff: === modified file 'misc/license.py' --- misc/license.py 2014-08-07 10:30:57 +0000 +++ misc/license.py 2014-08-07 11:16:49 +0000 @@ -222,7 +222,7 @@ pkgs = [] pkgs_names = [] - with open(name_f, 'r') as f: + with codecs.open(name_f, 'r', encoding='utf-8') as f: for meta in f.readlines(): (pkg, version) = meta.split() pkgs.append((pkg, version)) @@ -336,7 +336,7 @@ _found, _unknown = _stripper(cc) if _unknown: - with open(copyright, 'r') as f: + with codecs.open(copyright, 'r', encoding='utf-8') as f: _found, _unknown = _stripper(f.read()) if _unknown: @@ -386,7 +386,7 @@ if '.json' not in dump_f: dump_f += ".json" - with open(dump_f, 'w') as f: + with codecs.open(dump_f, 'w', encoding='utf-8') as f: f.write(json.dumps(licenses, indent=4)) return licenses @@ -431,7 +431,7 @@ # Copy in the manifest LOG.info("Adding manifest to HTML") - with open(manifest, 'r') as f: + with codecs.open(manifest, 'r', encoding='utf-8') as f: for line in f.readlines(): text += "
  • %s
  • " % line.strip() text += "\n\n" @@ -453,7 +453,7 @@ LOG.info(" Packages licensed %s" % npkgs) license_f = "%s/%s" % (common_license_d, std_license) license_txt = None - with open(license_f, 'r') as f: + with codecs.open(license_f, 'r', encoding='utf-8') as f: license_txt = f.read() LOG.info(" Read %s" % license_f) @@ -490,7 +490,7 @@ LOG.info(" Adding %s as text" % nstd_l) try: - with open(nstd_l, 'r') as f: + with codecs.open(nstd_l, 'r', encoding='utf-8') as f: license_txt = f.read() except: continue @@ -509,7 +509,7 @@ # Write the output html if ".html" not in dump_f: dump_f += ".html" - with open(dump_f, 'w') as f: + with codecs.open(dump_f, 'w', encoding='utf-8') as f: f.write(text) + echo '' + echo '====== ec2-publishing-scripts [/tmp/ec2-publishing-scripts] ======' ====== ec2-publishing-scripts [/tmp/ec2-publishing-scripts] ====== + cd /tmp/ec2-publishing-scripts + bzr info Standalone tree (format: unnamed) Location: branch root: . Related branches: parent branch: http://bazaar.launchpad.net/~ubuntu-on-ec2/ubuntu-on-ec2/ec2-publishing-scripts/ + bzr version-info revision-id: ben.howard@ubuntu.com-20140721234030-va9bci9q4jnlozbm date: 2014-07-21 17:40:30 -0600 build-date: 2014-08-16 05:23:15 +0000 revno: 577 branch-nick: ec2-publishing-scripts + bzr log -p -r-1 ------------------------------------------------------------ revno: 577 committer: Ben Howard branch nick: trunk timestamp: Mon 2014-07-21 17:40:30 -0600 message: Removed unneeded debug diff: === modified file 'ec2-image2ebs' --- ec2-image2ebs 2014-07-21 18:53:02 +0000 +++ ec2-image2ebs 2014-07-21 23:40:30 +0000 @@ -573,7 +573,6 @@ # SSDs use the gp2 disk type args[${#args[@]}]="--block-device-mapping" args[${#args[@]}]="/dev/sda1=${snapshot_id}::true:gp2" - args[${#args[@]}]="--debug" ;; *io1) # Provisioned IOPs use io1 + echo '' + echo '====== live-build [/tmp/live-build] ======' ====== live-build [/tmp/live-build] ====== + cd /tmp/live-build + bzr info Standalone tree (format: 1.9-rich-root) Location: branch root: . Related branches: parent branch: http://bazaar.launchpad.net/~ubuntu-on-ec2/live-build/cloud-images/ + bzr version-info revision-id: ben.howard@canonical.com-20140331230745-0qe08186ylyg1pkr date: 2014-03-31 17:07:45 -0600 build-date: 2014-08-16 05:23:15 +0000 revno: 1874 branch-nick: live-build + bzr log -p -r-1 ------------------------------------------------------------ revno: 1874 [merge] committer: Ben Howard branch nick: live-build timestamp: Mon 2014-03-31 17:07:45 -0600 message: Mount dev to work with Trusty PPC64EL images diff: === modified file 'scripts/build/lb_chroot_devpts' --- scripts/build/lb_chroot_devpts 2011-11-28 17:56:01 +0000 +++ scripts/build/lb_chroot_devpts 2014-03-31 22:21:42 +0000 @@ -43,6 +43,8 @@ # Creating lock file Create_lockfile .lock + ${LB_ROOT_COMMAND} mount devtmpfs -t devtmpfs chroot/dev + if [ "${LB_USE_FAKEROOT}" != "true" ] then # Creating mountpoint @@ -76,6 +78,8 @@ fi fi + ${LB_ROOT_COMMAND} umount chroot/dev || true + # Removing stage file rm -f .stage/chroot_devpts ;; ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions. + echo '' + echo '====== vmbuilder-0.11 [/tmp/vmbuilder-0.11] ======' ====== vmbuilder-0.11 [/tmp/vmbuilder-0.11] ====== + cd /tmp/vmbuilder-0.11 + bzr info Standalone tree (format: 2a) Location: branch root: . Related branches: parent branch: http://bazaar.launchpad.net/~ubuntu-on-ec2/vmbuilder/0.11a/ + bzr version-info revision-id: ben.howard@canonical.com-20120605221454-crv9cc4612f907lh date: 2012-06-05 16:14:54 -0600 build-date: 2014-08-16 05:23:16 +0000 revno: 398 branch-nick: vmbuilder-0.11 + bzr log -p -r-1 ------------------------------------------------------------ revno: 398 committer: Ben Howard branch nick: vmbuilder timestamp: Tue 2012-06-05 16:14:54 -0600 message: Fix for allow vmbuilder to run on 12.04 LTS. diff: === modified file 'VMBuilder/plugins/ubuntu/dapper.py' --- VMBuilder/plugins/ubuntu/dapper.py 2011-05-18 20:49:25 +0000 +++ VMBuilder/plugins/ubuntu/dapper.py 2012-06-05 22:14:54 +0000 @@ -157,18 +157,15 @@ self.vm.addpkg += ['openssh-server'] def mount_dev_proc(self): - run_cmd('mount', '--bind', '/dev', '%s/dev' % self.destdir) - self.vm.add_clean_cmd('umount', '%s/dev' % self.destdir, ignore_fail=True) - - run_cmd('mount', '--bind', '/dev/pts', '%s/dev/pts' % self.destdir) + run_cmd('mkdir', '-p', '%s/dev/pts' % self.destdir) + run_cmd('mount', '-t', 'devpts', 'devpts-live', '%s/dev/pts' % self.destdir) self.vm.add_clean_cmd('umount', '%s/dev/pts' % self.destdir, ignore_fail=True) - self.run_in_target('mount', '-t', 'proc', 'proc', '/proc') + run_cmd('mount', '-t', 'proc', 'proc-live', '%s/proc' % self.destdir) self.vm.add_clean_cmd('umount', '%s/proc' % self.destdir, ignore_fail=True) def unmount_dev_proc(self): run_cmd('umount', '%s/dev/pts' % self.destdir) - run_cmd('umount', '%s/dev' % self.destdir) run_cmd('sh', '-c', 'grep -q "$1" /proc/mounts || exit 0; umount "$1"', 'umount_binfmt', "%s/proc/sys/fs/binfmt_misc" % self.destdir) run_cmd('umount', '%s/proc' % self.destdir) + echo ''