Bug 746223 - remove nsinstall's -l flag; r=glandium
☠☠ backed out by ff7fce994eaa ☠ ☠
authorNathan Froyd <froydnj@mozilla.com>
Mon, 17 Sep 2012 17:28:50 -0400
changeset 113678 be916ac9a1b4913bc51d7591b2a73914668bc7db
parent 113677 49cc2fef3a629424e7b7b0871e6f282cbe0431a2
child 113679 ff7fce994eaa1e96cc9656bbdc69307ba9379413
push id1708
push userakeybl@mozilla.com
push dateMon, 19 Nov 2012 21:10:21 +0000
treeherdermozilla-beta@27b14fe50103 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs746223
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 746223 - remove nsinstall's -l flag; r=glandium
config/nsinstall.c
config/nsinstall.py
--- a/config/nsinstall.c
+++ b/config/nsinstall.c
@@ -280,25 +280,22 @@ main(int argc, char **argv)
 	    cwd = optarg;
 	    break;
 	  case 'D':
 	    onlydir = 1;
 	    break;
 	  case 'd':
 	    dodir = 1;
 	    break;
-	  case 'l':
-	    dolink = 1;
-	    break;
 	  case 'L':
 	    linkprefix = optarg;
 	    lplen = strlen(linkprefix);
 	    dolink = 1;
 	    break;
-     case 'R':
+	  case 'R':
 	    dolink = dorelsymlink = 1;
 	    break;
 	  case 'm':
 	    mode = strtoul(optarg, &cp, 8);
 	    if (mode == 0 && cp == optarg)
 		usage();
 	    break;
 	  case 'o':
@@ -384,17 +381,17 @@ main(int argc, char **argv)
             if (access(name, R_OK) != 0) {
                 fail("cannot access %s", name);
             }
 	    if (*name == '/') {
 		/* source is absolute pathname, link to it directly */
 		linkname = 0;
 	    } else {
 		if (linkprefix) {
-		    /* -L implies -l and prefixes names with a $cwd arg. */
+		    /* -L prefixes names with a $cwd arg. */
 		    len += lplen + 1;
 		    linkname = xmalloc((unsigned int)(len + 1));
 		    sprintf(linkname, "%s/%s", linkprefix, name);
 		} else if (dorelsymlink) {
 		    /* Symlink the relative path from todir to source name. */
 		    linkname = xmalloc(PATH_MAX);
 
 		    if (*todir == '/') {
--- a/config/nsinstall.py
+++ b/config/nsinstall.py
@@ -26,18 +26,16 @@ def _nsinstall_internal(argv):
   p.add_option('-t', action="store_true",
                help="Preserve time stamp")
   p.add_option('-m', action="store",
                help="Set mode", metavar="mode")
   p.add_option('-d', action="store_true",
                help="Create directories in target")
   p.add_option('-R', action="store_true",
                help="Use relative symbolic links (ignored)")
-  p.add_option('-l', action="store_true",
-               help="Create link (ignored)")
   p.add_option('-L', action="store", metavar="linkprefix",
                help="Link prefix (ignored)")
   p.add_option('-X', action="append", metavar="file",
                help="Ignore a file when installing a directory recursively.")
 
   # The remaining arguments are not used in our tree, thus they're not
   # implented.
   def BadArg(option, opt, value, parser):