public inbox for cygwin-apps-cvs@sourceware.org
help / color / mirror / Atom feed
* [setup - the official Cygwin setup program] branch master, updated. release_2.917-3-g489d9c53
@ 2022-01-28 14:34 Jon TURNEY
0 siblings, 0 replies; only message in thread
From: Jon TURNEY @ 2022-01-28 14:34 UTC (permalink / raw)
To: cygwin-apps-cvs
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=489d9c53cc7c795ff5f6b8016b8613e321e5845c
commit 489d9c53cc7c795ff5f6b8016b8613e321e5845c
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Jan 27 22:14:34 2022 +0000
Reset GUI feedback state after ini parsing
If we're in --local-install mode, we're shortly going to disappear into
packagemeta::ScanDownloadedFiles() which (currently) gives no feedback.
Don't make it look like we're still in the middle of parsing ini files
while we do that.
Also fix a typo introduced in b3cc8ab6.
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=3c754445f39b2be8cc6df94822da7102b018c60c
commit 3c754445f39b2be8cc6df94822da7102b018c60c
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Jan 27 22:07:28 2022 +0000
Unconditionally fixup source package ids
In the case when a given package version appears in setup.ini first
with, then without an install: line, the source package is recreated by
packagemeta::add_version() to add the additional package source site,
but the install package is not - so it now contains a stale source
package id.
Unconditionally fixup source package ids, so that install package points
to the correct source package.
Also internalize libsolv attributes after doing fixup, the changes it
makes are visible (so this was probably never working right).
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=dec97682edf6fdfdfd9b3f58e22dd3b2e7a1218d
commit dec97682edf6fdfdfd9b3f58e22dd3b2e7a1218d
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Jan 27 17:14:03 2022 +0000
Add '--batch' to gpg command in 'make upload'
'--batch' is recommended for any non-interative use of gpg.
Diff:
---
Makefile.am | 2 +-
ini.cc | 7 +++++--
package_db.cc | 10 ++++------
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 3d032d68..ee72766c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -313,7 +313,7 @@ SIGN_KEYS="--enable-dsa2 --personal-digest-preferences=sha256 -u 676041BA -u 1A6
upload: release
scp setup-${VER}.$(ARCH).exe setup-${VER}.$(ARCH).dbg ${UPLOAD_HOST}:${UPLOAD_PATH}
- ssh ${UPLOAD_HOST} gpg ${SIGN_KEYS} --detach-sign ${UPLOAD_PATH}/setup-${VER}.$(ARCH).exe
+ ssh ${UPLOAD_HOST} gpg --batch ${SIGN_KEYS} --detach-sign ${UPLOAD_PATH}/setup-${VER}.$(ARCH).exe
clean-local:
rm -f setup*${EXEEXT} setup*.dbg
diff --git a/ini.cc b/ini.cc
index 99b2ac63..1fd39ba1 100644
--- a/ini.cc
+++ b/ini.cc
@@ -69,9 +69,10 @@ class GuiParseFeedback : public IniParseFeedback
public:
GuiParseFeedback () : lastpct (0)
{
+ Progress.SetText1 (IDS_PROGRESS_PARSING);
Progress.SetText2 ("");
Progress.SetText3 ("");
- Progress.SetText4 (IDS_PROGRESS_PARSING);
+ Progress.SetText4 (IDS_PROGRESS_PROGRESS);
yyerror_count = 0;
yyerror_messages.clear ();
@@ -98,7 +99,6 @@ public:
}
virtual void iniName (const std::string& name)
{
- Progress.SetText1 (IDS_PROGRESS_PARSING);
Progress.SetText2 (name.c_str ());
Progress.SetText3 ("");
filename = name;
@@ -134,7 +134,10 @@ public:
}
virtual ~ GuiParseFeedback ()
{
+ Progress.SetText2 ("");
+ Progress.SetText3 ("");
Progress.SetText4 (IDS_PROGRESS_PACKAGE);
+ Progress.SetBar1 (0);
}
private:
unsigned int lastpct;
diff --git a/package_db.cc b/package_db.cc
index 5498ec03..03591d75 100644
--- a/package_db.cc
+++ b/package_db.cc
@@ -724,11 +724,6 @@ packagedb::fixup_source_package_ids()
for (std::set<packageversion>::iterator i = pkgm.versions.begin();
i != pkgm.versions.end(); ++i)
{
- /* If spkg_id is already known for this package, there's nothing to
- fix. */
- if (i->sourcePackage())
- continue;
-
/* Some packages really have no source, indicated by no [sS]ource:
line in setup.ini, which becomes an empty source package name */
const std::string spkg = i->sourcePackageName();
@@ -742,7 +737,8 @@ packagedb::fixup_source_package_ids()
if (spkg_id)
{
- i->fixup_spkg_id(spkg_id);
+ if (i->sourcePackage() != spkg_id)
+ i->fixup_spkg_id(spkg_id);
}
else
{
@@ -750,6 +746,8 @@ packagedb::fixup_source_package_ids()
}
}
}
+
+ solver.internalize();
}
void
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-01-28 14:34 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-28 14:34 [setup - the official Cygwin setup program] branch master, updated. release_2.917-3-g489d9c53 Jon TURNEY
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).