Merge branch 'main' into prestage_client

PelicanPlatform · Sep 29, 2024 · 09560a5 · 09560a5
2 parents ffb866d + 779ab97
commit 09560a5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 18 deletions.
diff --git a/cmd/object_ls.go b/cmd/object_ls.go
@@ -46,18 +46,12 @@ func init() {
 	flagSet := lsCmd.Flags()
 	flagSet.StringP("token", "t", "", "Token file to use for transfer")
 	flagSet.StringP("collections-url", "", "", "URL to use for collection listing, overriding the director's response")
-	flagSet.BoolP("long", "L", false, "Include extended information - The '-L' for long output will be changed to '-l' in the 7.11.0 pelican release")
+	flagSet.BoolP("long", "l", false, "Include extended information")
 	flagSet.BoolP("collection-only", "C", false, "List collections only")
 	flagSet.BoolP("object-only", "O", false, "List objects only")
 	flagSet.BoolP("json", "j", false, "Print results in JSON format")
 
 	objectCmd.AddCommand(lsCmd)
-
-	lsCmd.PersistentPreRun = func(cmd *cobra.Command, args []string) {
-		if cmd.Flags().Changed("long") {
-			log.Warningln("The '-L' for long output will be changed to '-l' in the 7.11.0 pelican release")
-		}
-	}
 }
 
 func listMain(cmd *cobra.Command, args []string) error {

diff --git a/cmd/root.go b/cmd/root.go
@@ -147,7 +147,7 @@ func init() {
 		panic(err)
 	}
 
-	rootCmd.PersistentFlags().StringP("log", "l", "", "Specified log output file - The '-l' for logging will be changed to '-L' in the 7.11.0 pelican release")
+	rootCmd.PersistentFlags().StringP("log", "L", "", "Specified log output file")
 	if err := viper.BindPFlag("Logging.LogLocation", rootCmd.PersistentFlags().Lookup("log")); err != nil {
 		panic(err)
 	}
@@ -169,10 +169,4 @@ func init() {
 	if err := viper.BindPFlag("Server.WebPort", portFlag); err != nil {
 		panic(err)
 	}
-
-	rootCmd.PersistentPreRun = func(cmd *cobra.Command, args []string) {
-		if cmd.Flags().Changed("log") {
-			log.Warningln("The '-l' for logging will be changed to '-L' in the 7.11.0 pelican release")
-		}
-	}
 }
diff --git a/github_scripts/get_put_test.sh b/github_scripts/get_put_test.sh
@@ -123,7 +123,7 @@ do
 done
 
 # Run pelican object put
-./pelican object put ./get_put_tmp/input.txt pelican://$HOSTNAME:8444/test/input.txt -d -t get_put_tmp/test-token.jwt -l get_put_tmp/putOutput.txt
+./pelican object put ./get_put_tmp/input.txt pelican://$HOSTNAME:8444/test/input.txt -d -t get_put_tmp/test-token.jwt -L get_put_tmp/putOutput.txt
 
 # Check output of command
 if grep -q "Dumping response: HTTP/1.1 200 OK" get_put_tmp/putOutput.txt; then
@@ -134,7 +134,7 @@ else
     exit 1
 fi
 
-./pelican object get pelican://$HOSTNAME:8444/test/input.txt get_put_tmp/output.txt -d -t get_put_tmp/test-token.jwt -l get_put_tmp/getOutput.txt
+./pelican object get pelican://$HOSTNAME:8444/test/input.txt get_put_tmp/output.txt -d -t get_put_tmp/test-token.jwt -L get_put_tmp/getOutput.txt
 
 # Check output of command
 if grep -q "HTTP Transfer was successful" get_put_tmp/getOutput.txt; then

diff --git a/images/Dockerfile b/images/Dockerfile
@@ -71,7 +71,7 @@ RUN \
     cd xrdcl-pelican && \
     git checkout v0.9.4 && \
     mkdir build && cd build && \
-    cmake -DLIB_INSTALL_DIR=/usr/lib64 .. && \
+    cmake -DLIB_INSTALL_DIR=/usr/lib64 -DCMAKE_BUILD_TYPE=RelWithDebInfo .. && \
     make && make install
 
 ADD https://api.github.com/repos/PelicanPlatform/xrootd-s3-http/git/refs/heads/main /tmp/hash-xrootd-s3-http

diff --git a/images/dev.Dockerfile b/images/dev.Dockerfile
@@ -70,7 +70,7 @@ RUN \
     cd xrdcl-pelican && \
     git checkout v0.9.4 && \
     mkdir build && cd build && \
-    cmake -DLIB_INSTALL_DIR=/usr/lib64 .. && \
+    cmake -DLIB_INSTALL_DIR=/usr/lib64 -DCMAKE_BUILD_TYPE=RelWithDebInfo .. && \
     make && make install
 
 ADD https://api.github.com/repos/PelicanPlatform/xrootd-s3-http/git/refs/heads/main /tmp/hash-xrootd-s3-http