Re: [RFR] upgrade-advisor
Franklin PIAT wrote:
> Once you've finished the modification, run :
(whilst standing in the right directory!)
> git-diff > ~/u-a.diff
> And send the patch.
Okay, attached.
>>> " post-upgrade Test the system after the upgrade, then display hints\n"
>>> " to get inline with freshly installed systems."
>>
>> Does this mean "then display hints for how to get online using the
>> freshly installed system."?
>
> A system that is upgraded to Lenny isn't identical to a freshly
> installed system : Some configuration defaults are different, some
> packages have been discontinued or replaced, etc..
>
> post-upgrade list such differences.
So they're "hints about how to make the system just like a freshly
installed system"? I'm sure there's a better way of putting that,
but I'm not seeing it. The best I can manage is "Test the system
after the upgrade, then display hints\n for emulating a freshly
installed system."
>>> #: ../upgrade-advisor.sh:304
>>> msgid "Invalid --debug argument: Function name expected (separated by commas)"
>>> msgstr ""
>>
>> (What are the commas separating the function name from?)
>
> Maybe something like :
>
> "Invalid argument. --debug expects a comma separated list of plugin names."
Okay. Tweaking it to:
"Invalid argument: --debug expects a comma-separated list of plug-in names."
>>> #: ../plugins/B-35_check_discontinued_packages:6
>>> msgid "Check discontinued package, in next release."
>>
>> "Checking for packages discontinued in the new release."
>>
>> (Assuming "discontinued" means "no longer available"; this isn't an
>> established usage, but it makes sense.)
>
> I've rephrased as "Checking for packages no longer available in next
^the
> release."
>>> #: ../plugins/B-35_check_discontinued_packages:18
>>> msgid "Check discontinued package in next release : Test skipped."
>> ^ ^
>> Ditto, plus ": test skipped.", without the extra space or
>> capitalisation.
>
> Damn it, I did that again ;(
^okay here
>>> #: ../plugins/B-35_check_nonfree_contrib:7
>>> msgid "Check contrib and non-free packages, since last release."
>>
>> What does this mean? Something like "Checking changes in contrib
>> and non-free packages since last release."?
>
> "Checking for installed contrib and non-free packages."
Oh, right. Well, that's fine.
>>> #: ../plugins/B-35_check_obsolete_packages:10
>>> #: ../plugins/B-35_check_orphan_packages:9
>>> msgid "Debian Release Notes, paragraph 'Obsolete packages' :"
>> ^
>> Again, no space before a colon.
>
> damn me !
Not there either!
>> So what should they be called? Well, I don't really know.
>> Dependentless packages? Pointless packages? Ideally we'd use
>> whatever term aptitude(8) or apt-get(8) use to describe this
>> functionality, but there doesn't seem to be one. Assuming this is
>> in fact a "deborphan" run, not a "deborphan -a", I'd suggest:
>>
>> "Checking installed packages for stray libraries."
>
> "stray" isn't very common for non-native English speakers.
>
> I've written this, but... it's odd.
> "Checking installed packages for deborphan'ed libraries."
Well, I personally dislike that use of apostrophe, but it isn't
clearly wrong. More problematic: is deborphan a verb that you can form
participles from?
Possible alternatives to "stray": "leftover", "surplus"... I'll say
"leftover libraries", since at least it's alliterative.
>> Doing the sentence this way round it's easier to deduce that it
>> means "orphans in the inside-out deborphan sense", but really
>> instead of using the wrong word and explaining it it's simpler to
>> say:
>> "Deborphan reports the following stray libraries:"
>
> I use this one.
If you adopt one of my suggestions above it could go here too.
README:
> I've replaced the footer with :
>
> | Read the README file in the plug-ins directory. (in
^
> | /usr/share/upgrade-advisor/plugins/)
^.
> |
> |[1] Release Notes (this link is for i386 architecture)
(^the)
> | http://www.debian.org/releases/stable/i386/release-notes/
By the way, _is_ aptitude recommended over apt-get this time? I
seem to remember people saying that it looked as if apt-get might be
better at handling Etch->Lenny. Or was that a nightmare?
--
JBR with qualifications in linguistics, experience as a Debian
sysadmin, and probably no clue about this particular package
diff --git a/.gitignore b/.gitignore
diff --git a/Makefile b/Makefile
diff --git a/README b/README
index c8bece8..dcab636 100644
--- a/README
+++ b/README
@@ -29,9 +29,9 @@ After upgrading
Writing a plug-in/Adding a test
-------------------------------
- Read the README file in the plug-ins directory. (in
- /usr/share/upgrade-advisor/plugins/)
+ Read the README file in the plug-ins directory (in
+ /usr/share/upgrade-advisor/plugins/).
-[1] Release Notes (this link is for i386 architecture)
+[1] Release Notes (this link is for the i386 architecture)
http://www.debian.org/releases/stable/i386/release-notes/
diff --git a/TODO b/TODO
diff --git a/changelog b/changelog
diff --git a/debian/changelog b/debian/changelog
diff --git a/debian/compat b/debian/compat
diff --git a/debian/control b/debian/control
diff --git a/debian/copyright b/debian/copyright
diff --git a/debian/dirs b/debian/dirs
diff --git a/debian/docs b/debian/docs
diff --git a/debian/links b/debian/links
diff --git a/debian/patches/00list b/debian/patches/00list
diff --git a/debian/patches/adjust-plugin-location.dpatch b/debian/patches/adjust-plugin-location.dpatch
diff --git a/debian/rules b/debian/rules
diff --git a/debian/upgrade-advisor.help2man b/debian/upgrade-advisor.help2man
diff --git a/plugins/A-10_check_os b/plugins/A-10_check_os
diff --git a/plugins/A-11_check_architecture b/plugins/A-11_check_architecture
diff --git a/plugins/A-20_check_update_grub_path b/plugins/A-20_check_update_grub_path
diff --git a/plugins/A-20_etc_network_options_deprecated b/plugins/A-20_etc_network_options_deprecated
diff --git a/plugins/A-50_upgrade_to_rsyslog b/plugins/A-50_upgrade_to_rsyslog
diff --git a/plugins/B-10_check_dpkg_audit b/plugins/B-10_check_dpkg_audit
diff --git a/plugins/B-15_check_apt_sources b/plugins/B-15_check_apt_sources
diff --git a/plugins/B-25_dump_contrib_nonfree_pkg_list b/plugins/B-25_dump_contrib_nonfree_pkg_list
diff --git a/plugins/B-25_dump_pkg_list b/plugins/B-25_dump_pkg_list
diff --git a/plugins/B-25_fetch_package_info b/plugins/B-25_fetch_package_info
diff --git a/plugins/B-35_check_discontinued_packages b/plugins/B-35_check_discontinued_packages
index f2b6847..c7bfe3f 100755
--- a/plugins/B-35_check_discontinued_packages
+++ b/plugins/B-35_check_discontinued_packages
@@ -3,7 +3,7 @@
check_discontinued_packages() {
local current="${TMP}_pkgnames"
local next="${TMP}_${TARGET_OS_REPO}_main"
- title "Checking for packages no longer available in next release."
+ title "Checking for packages no longer available in the next release."
if [ "${TARGET_OS_REPO}" ]; then
return 0
@@ -15,6 +15,6 @@ check_discontinued_packages() {
grep -Fv -f "$next" "$current" | extra
fi
else
- gecho "Checking for packages no longer available in next release: test skipped." | warn
+ gecho "Checking for packages no longer available in the next release: test skipped." | warn
fi
}
diff --git a/plugins/B-35_check_etc_apt_preferences b/plugins/B-35_check_etc_apt_preferences
diff --git a/plugins/B-35_check_nonfree_contrib b/plugins/B-35_check_nonfree_contrib
diff --git a/plugins/B-35_check_obsolete_packages b/plugins/B-35_check_obsolete_packages
diff --git a/plugins/B-35_check_orphan_packages b/plugins/B-35_check_orphan_packages
index ec9cb5e..85cf76d 100755
--- a/plugins/B-35_check_orphan_packages
+++ b/plugins/B-35_check_orphan_packages
@@ -1,11 +1,11 @@
#!/bin/sh
check_orphan_packages() {
- title "Checking installed packages for deborphan'ed libraries."
+ title "Checking installed packages for leftover libraries."
if type deborphan > /dev/null 2>&1 ; then
if [ $(deborphan | wc -l) -gt 0 ]; then
- gecho "Deborphan reports the following stray libraries:" | info
+ gecho "Deborphan reports the following leftover libraries:" | info
gecho "see Debian Release Notes, paragraph 'Obsolete packages'." | extra
echo "$RELNOTES/ch-upgrading.html#obsolete" | extra
deborphan | extra
diff --git a/plugins/B-35_check_packages_status b/plugins/B-35_check_packages_status
diff --git a/plugins/B-35_fetch_modules b/plugins/B-35_fetch_modules
diff --git a/plugins/B-40_check_hypervisor b/plugins/B-40_check_hypervisor
index f7136e1..47fff9a 100755
--- a/plugins/B-40_check_hypervisor
+++ b/plugins/B-40_check_hypervisor
@@ -11,7 +11,7 @@ check_hypervisor() {
gecho "A Xen hypervisor was detected." | warn
{
gecho "It usually requires special steps to upgrade the kernel."
- gecho "Verify kernel availablability/compatibility before upgrade."
+ gecho "Verify kernel availability/compatibility before upgrade."
} | extra
#TODO check /sys/hypervisor/version/*
;;
diff --git a/plugins/B-40_check_kernel b/plugins/B-40_check_kernel
index 73dfef5..1fd8e50 100755
--- a/plugins/B-40_check_kernel
+++ b/plugins/B-40_check_kernel
@@ -30,7 +30,7 @@ check_kernel() {
;;
*)
gecho "Skipping kernel tests: this tool doesn't support the current kernel." | warn
- gecho "Verify kernel availablability/compatibility before upgrade." | verbose
+ gecho "Verify kernel availability/compatibility before upgrade." | verbose
;;
esac
}
diff --git a/plugins/B-40_check_udev b/plugins/B-40_check_udev
index 74610e4..66a75c6 100755
--- a/plugins/B-40_check_udev
+++ b/plugins/B-40_check_udev
@@ -5,7 +5,7 @@ check_udev() {
mount | grep -E "on /dev[^/]" > ${TMP}_udev
if ! grep -q "udev" ${TMP}_udev ; then
if grep "devfs" ${TMP}_udev ; then
- gecho "/dev is using defvs. This option is no longer unsuported. use udev instead." | alert
+ gecho "/dev is using defvs. This option is no longer supported; use udev instead." | alert
gecho "Debian Release Notes, paragraph 'Converting from devfs':" | info
echo "$RELNOTES/ch-upgrading.html#convert-devfs" | extra
echo "$RELNOTES/ch-whats-new.html#kernel-udev" | extra
diff --git a/plugins/B-70_check_aptitude b/plugins/B-70_check_aptitude
diff --git a/plugins/README b/plugins/README
diff --git a/po/Makefile b/po/Makefile
diff --git a/po/fr.po b/po/fr.po
diff --git a/po/upgrade-advisor.pot b/po/upgrade-advisor.pot
diff --git a/upgrade-advisor.sh b/upgrade-advisor.sh
index 8b5fa7a..efecb92 100755
--- a/upgrade-advisor.sh
+++ b/upgrade-advisor.sh
@@ -47,9 +47,9 @@ fi
### Declare the functions ###
show_valid_commands() {
gecho " pre-upgrade Test the system prior to the upgrade, then display hints
- to ensure seemless upagrade.
+ to ensure seamless upgrade.
post-upgrade Test the system after the upgrade, then display hints
- to get inline with freshly installed systems."
+ for emulating a freshly installed system."
}
usage () {
@@ -303,13 +303,13 @@ for option in "$@"; do
# It only works in bash (because of FUNCNAME variable)
DEBUG=${option#--debug=}
if [ ! "$DEBUG" ]; then
- gecho "Invalid --debug argument: Function name expected (separated by commas)" | error
+ gecho "Invalid argument: --debug expects a comma-separated list of plug-in names." | error
exit 1
fi
;;
pre-upgrade|post-upgrade)
if [ "$COMMAND" ] ; then
- gecho "Invalid command line option '$option' : The command '$COMMAND' was already specified." | error
+ gecho "Invalid command line option '$option': the command '$COMMAND' was already specified." | error
exit 1
fi
COMMAND="$option"
Reply to: