From: Ken Brown <kbrown@cornell.edu>
To: cygwin-apps@cygwin.com
Subject: [PATCH setup, revised 2/2] Avoid clobbering installed.db when no setup.ini is found
Date: Sat, 28 Oct 2017 17:46:00 -0000 [thread overview]
Message-ID: <20171028174619.4824-1-kbrown@cornell.edu> (raw)
If no setup.ini is found, do_ini_thread is never called. But we need
to ensure that packagedb::read is called, or else installed.db gets
emptied. Move the calls to packagedb::read and other packagedb
functions from do_ini_thread to ChooserPage::OnInit.
---
choose.cc | 8 +++++++-
ini.cc | 7 -------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/choose.cc b/choose.cc
index 619d7db..3a990d5 100644
--- a/choose.cc
+++ b/choose.cc
@@ -264,10 +264,16 @@ ChooserPage::OnInit ()
}
SetBusy ();
+ packagedb db;
+ db.makeBase();
+ db.read();
+ db.upgrade();
+ db.fixup_source_package_ids();
+ db.removeEmptyCategories();
+
if (source == IDC_SOURCE_DOWNLOAD || source == IDC_SOURCE_LOCALDIR)
packagemeta::ScanDownloadedFiles (MirrorOption);
- packagedb db;
db.setExistence ();
db.fillMissingCategory ();
diff --git a/ini.cc b/ini.cc
index 5089e8b..0f8b927 100644
--- a/ini.cc
+++ b/ini.cc
@@ -352,13 +352,6 @@ do_ini_thread (HINSTANCE h, HWND owner)
else
ini_count = do_remote_ini (owner);
- packagedb db;
- db.makeBase();
- db.read();
- db.upgrade();
- db.fixup_source_package_ids();
- db.removeEmptyCategories();
-
if (ini_count == 0)
return false;
--
2.14.3
reply other threads:[~2017-10-28 17:46 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171028174619.4824-1-kbrown@cornell.edu \
--to=kbrown@cornell.edu \
--cc=cygwin-apps@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).