On Sat, Oct 15, 2022 at 01:10:09PM +0800, Zorro Lang wrote:
> On Sat, Oct 15, 2022 at 01:01:44PM +0800, Zorro Lang wrote:
> > On Fri, Oct 14, 2022 at 11:21:55AM -0700, Darrick J. Wong wrote:
> > > From: Darrick J. Wong <djwong@xxxxxxxxxx>
> > >
> > > Make the variable that holds the contents of the metadump description
> > > file a local variable since we don't need it outside of that function.
> > >
> > > Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
> > > Reviewed-by: Zorro Lang <zlang@xxxxxxxxxx>
> > > ---
> > > v1.1: dont export POPULATE_METADUMP; change the description a bit
> > > ---
> >
> > So you don't need to export the POPULATE_METADUMP anymore? I remembered you
> > said something broken and "exporting the variable made it work". Before I
> > merge this patch, hope to double check with you.
>
> And the subject is still "populate: export the metadump description name", I
> think it's not suit for this change. Anyway, as this patch is not depended by
> others, I can merge other 4 patches at first. To give you enough time to think
> about what do you really like to change :)
<sigh> I updated the commit message in git and forgot to copy-paste the
new subject into the email. Sorry about all this stupid crap, bash is a
terrible language and email is a godawful process and both should be
smote off the planet.
--D
> Thanks,
> Zorro
>
> >
> > Thanks,
> > Zorro
> >
> > > common/populate | 8 ++++----
> > > 1 file changed, 4 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/common/populate b/common/populate
> > > index cfdaf766f0..ba34ca5844 100644
> > > --- a/common/populate
> > > +++ b/common/populate
> > > @@ -868,15 +868,15 @@ _scratch_populate_cached() {
> > > local meta_tag="$(echo "${meta_descr}" | md5sum - | cut -d ' ' -f 1)"
> > > local metadump_stem="${TEST_DIR}/__populate.${FSTYP}.${meta_tag}"
> > >
> > > - # These variables are shared outside this function
> > > + # This variable is shared outside this function
> > > POPULATE_METADUMP="${metadump_stem}.metadump"
> > > - POPULATE_METADUMP_DESCR="${metadump_stem}.txt"
> > > + local populate_metadump_descr="${metadump_stem}.txt"
> > >
> > > # Don't keep metadata images cached for more 48 hours...
> > > rm -rf "$(find "${POPULATE_METADUMP}" -mtime +2 2>/dev/null)"
> > >
> > > # Throw away cached image if it doesn't match our spec.
> > > - cmp -s "${POPULATE_METADUMP_DESCR}" <(echo "${meta_descr}") || \
> > > + cmp -s "${populate_metadump_descr}" <(echo "${meta_descr}") || \
> > > rm -rf "${POPULATE_METADUMP}"
> > >
> > > # Try to restore from the metadump
> > > @@ -885,7 +885,7 @@ _scratch_populate_cached() {
> > >
> > > # Oh well, just create one from scratch
> > > _scratch_mkfs
> > > - echo "${meta_descr}" > "${POPULATE_METADUMP_DESCR}"
> > > + echo "${meta_descr}" > "${populate_metadump_descr}"
> > > case "${FSTYP}" in
> > > "xfs")
> > > _scratch_xfs_populate $@
> > >
> >
>
