launchpad-reviewers team mailing list archive

[Gavin Panella <gavin.panella@xxxxxxxxxxxxx>]

Gavin Panella has proposed merging lp:~allenap/maas/pxe-file-import into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1032665 in MAAS: "maas-import-pxe-files: error retrieving current directory: getcwd: cannot access parent directories: No such file or directory"
  https://bugs.launchpad.net/maas/+bug/1032665

For more details, see:
https://code.launchpad.net/~allenap/maas/pxe-file-import/+merge/118135
-- 
https://code.launchpad.net/~allenap/maas/pxe-file-import/+merge/118135
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~allenap/maas/pxe-file-import into lp:maas.

=== modified file 'scripts/maas-import-ephemerals'
--- scripts/maas-import-ephemerals	2012-07-27 18:30:18 +0000
+++ scripts/maas-import-ephemerals	2012-08-03 15:58:21 +0000
@@ -434,8 +434,11 @@
 fi
 
 
+if [ -z "$NO_COBBLER" ]
+then
 ISCSI_TARGET_IP=${ISCSI_TARGET_IP:-${SERVER_IP}}
 [ -n "$ISCSI_TARGET_IP" ] || fail "ISCSI_TARGET_IP must have a value"
+fi
 
 
 if [ -z "$NO_COBBLER" ]

=== modified file 'scripts/maas-import-pxe-files'
--- scripts/maas-import-pxe-files	2012-08-03 13:22:39 +0000
+++ scripts/maas-import-pxe-files	2012-08-03 15:58:21 +0000
@@ -107,7 +107,7 @@
 
     DOWNLOAD_DIR=$(mktemp -d)
     echo "Downloading to temporary location $DOWNLOAD_DIR."
-    cd -- $DOWNLOAD_DIR
+    pushd -- $DOWNLOAD_DIR
 
     # All files we create here are public.  The TFTP user will need to be
     # able to read them.
@@ -123,6 +123,7 @@
         done
     done
 
+    popd
     rm -rf -- $DOWNLOAD_DIR
 }