Merge lp://staging/~apw/update-manager/cdromupgrade-absolute-path into lp://staging/update-manager

Proposed by Andy Whitcroft
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~apw/update-manager/cdromupgrade-absolute-path
Merge into: lp://staging/update-manager
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~apw/update-manager/cdromupgrade-absolute-path
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+4012@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Andy Whitcroft (apw) wrote :

When using the alternate installer to do cdromupgrades the installer will fail if run with a relative path. The error produced is very confusing. Fix this up.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'DistUpgrade/cdromupgrade'
2--- DistUpgrade/cdromupgrade 2009-02-09 12:11:25 +0000
3+++ DistUpgrade/cdromupgrade 2009-02-27 10:25:33 +0000
4@@ -14,6 +14,11 @@
5 UPGRADER_DIR=dists/$CODENAME/main/dist-upgrader/binary-all/
6
7 cddirname="${0%\/*}"
8+case "$cddirname" in
9+/*) ;;
10+*) cddirname="`pwd`/$cddirname" ;;
11+esac
12+
13 fullpath="$cddirname/$UPGRADER_DIR"
14
15 # extract the tar to a TMPDIR and run it from there
16
17=== modified file 'debian/changelog'
18--- debian/changelog 2009-02-26 15:07:49 +0000
19+++ debian/changelog 2009-02-27 10:25:33 +0000
20@@ -1,3 +1,12 @@
21+update-manager (1:0.98.4) UNRELEASED; urgency=low
22+
23+ * DistUpgrade/cdromupgrade:
24+ - if cdromupgrade is run with a relative path we will fail to find the
25+ installer components and error out. Ensure that the path is absolute.
26+ (LP: #335360)
27+
28+ -- Andy Whitcroft <apw@canonical.com> Fri, 27 Feb 2009 10:07:39 +0000
29+
30 update-manager (1:0.98.3) jaunty; urgency=low
31
32 [ Brian Murray ]

Subscribers

People subscribed via source and target branches

to status/vote changes: