deploy: f0e8d44

sylvestre · sylvestre · commit 95c7acb548df · 2023-02-27T02:54:32.000Z
diff --git a/dev/src/uu_cp/copydir.rs.html b/dev/src/uu_cp/copydir.rs.html
@@ -549,7 +549,7 @@
     <span class="kw">fn </span>new(root: <span class="kw-2">&amp;</span><span class="lifetime">&#39;a </span>Path, target: <span class="kw-2">&amp;</span><span class="lifetime">&#39;a </span>Path) -&gt; std::io::Result&lt;<span class="self">Self</span>&gt; {
         <span class="kw">let </span>current_dir = env::current_dir()<span class="question-mark">?</span>;
         <span class="kw">let </span>root_path = current_dir.join(root);
-        <span class="kw">let </span>root_parent = <span class="kw">if </span>target.exists() {
+        <span class="kw">let </span>root_parent = <span class="kw">if </span>target.exists() &amp;&amp; !root.to_str().unwrap().ends_with(<span class="string">&quot;/.&quot;</span>) {
             root_path.parent().map(|p| p.to_path_buf())
         } <span class="kw">else </span>{
             <span class="prelude-val">Some</span>(root_path)
diff --git a/dev/src/uu_uptime/uptime.rs.html b/dev/src/uu_uptime/uptime.rs.html
@@ -304,8 +304,8 @@
             USER_PROCESS =&gt; nusers += <span class="number">1</span>,
             BOOT_TIME =&gt; {
                 <span class="kw">let </span>dt = line.login_time();
-                <span class="kw">if </span>dt.second() &gt; <span class="number">0 </span>{
-                    boot_time = <span class="prelude-val">Some</span>(dt.second() <span class="kw">as </span>time_t);
+                <span class="kw">if </span>dt.unix_timestamp() &gt; <span class="number">0 </span>{
+                    boot_time = <span class="prelude-val">Some</span>(dt.unix_timestamp() <span class="kw">as </span>time_t);
                 }
             }
             <span class="kw">_ </span>=&gt; <span class="kw">continue</span>,

Original file line number	Diff line number	Diff line change
`@@ -304,8 +304,8 @@`
`304`	`304`	`USER_PROCESS => nusers += <span class="number">1</span>,`
`305`	`305`	`BOOT_TIME => {`
`306`	`306`	`<span class="kw">let </span>dt = line.login_time();`
`307`		`- <span class="kw">if </span>dt.second() > <span class="number">0 </span>{`
`308`		`- boot_time = <span class="prelude-val">Some</span>(dt.second() <span class="kw">as </span>time_t);`
	`307`	`+ <span class="kw">if </span>dt.unix_timestamp() > <span class="number">0 </span>{`
	`308`	`+ boot_time = <span class="prelude-val">Some</span>(dt.unix_timestamp() <span class="kw">as </span>time_t);`
`309`	`309`	`}`
`310`	`310`	`}`
`311`	`311`	`<span class="kw">_ </span>=> <span class="kw">continue</span>,`