Check-in [2649d421c8]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:2649d421c81f1158475eb231a51f4bf1b2eb0656
Date: 2012-03-27 08:57:10
User: BarryK
Comment:Precise: ppm repo selected radiobutton did not match displayed packages at startup

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/usr/local/petget/pkg_chooser.sh

@@ -13,10 +13,11 @@
 #101205 bugfix for: make sure first radiobutton matches list of pkgs.
 #110118 alternate User Interfaces. see also configure.sh.
 #110505 support sudo for non-root user.
 #110706 fix for deps checking.
 #120203 BK: internationalized.
+#120327 sometimes the selected repo radiobutton did not match listed packages at startup.
 
 export TEXTDOMAIN=petget___pkg_chooser.sh
 export OUTPUT_CHARSET=UTF-8
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
@@ -249,10 +250,16 @@
 ${PUPPY_DBS}
 ${COMPAT_DBS}"
 FIRST_DB_cut="`echo -n "$FIRST_DB" | cut -f 1,2 -d '-' | sed -e 's%\\-%\\\\-%g'`" #ex: puppy-lucid-official cut to puppy\-lucid.
 fdPATTERN='>'"$FIRST_DB_cut"'<'
 DB_temp0="`echo "$DB_ORDERED" | sed -e 's%^$%%' | grep "$fdPATTERN"`"
+if [ ! "$DB_temp0" ];then #120327 above may fail.
+ #ex: FIRST_DB=ubuntu-precise-main, DB_ORDERED=puppy-precise\npuppy-noarch\nubuntu-precise-main\nubuntu-precise-multiverse
+ FIRST_DB_cut="`echo -n "$FIRST_DB" | cut -f 1,2,3 -d '-' | sed -e 's%\\-%\\\\-%g'`" #ex: ubuntu-precise-main becomes ubuntu\-precise\-main
+ fdPATTERN='>'"$FIRST_DB_cut"'<'
+ DB_temp0="`echo "$DB_ORDERED" | sed -e 's%^$%%' | grep "$fdPATTERN"`"
+fi
 DB_temp1="`echo "$DB_ORDERED" | sed -e 's%^$%%' | grep -v "$fdPATTERN"`"
 DB_ORDERED="$DB_temp0
 $DB_temp1"
 
 #  <text use-markup=\"true\"><label>\"<b>Just click on a package!</b>\"</label></text>

Changes to woof-distro/x86/ubuntu/precise/DISTRO_PKGS_SPECS-ubuntu-precise

@@ -260,10 +260,11 @@
 no|hal|hal,libhal1,libhal-dev,libhal-storage1,libhal-storage-dev|exe,dev,doc,nls|+udev,+libvolume-id,+lsb-base,+policykit
 no|hal||exe,dev,doc,nls| #TRY see if works without hal
 yes|hardinfo|hardinfo|exe,dev,doc,nls
 yes|hdparm|hdparm|exe,dev>null,doc,nls
 yes|heimdal|heimdal-dev,heimdal-multidev,libasn1-8-heimdal,libgssapi3-heimdal,libhcrypto4-heimdal,libhdb9-heimdal,libheimbase1-heimdal,libhx509-5-heimdal,libkadm5clnt7-heimdal,libkadm5srv8-heimdal,libkafs0-heimdal,libkdc2-heimdal,libkrb5-26-heimdal,libwind0-heimdal,libroken18-heimdal,libheimntlm0-heimdal,|exe,dev,doc,nls| #all this crap needed by cupsd.
+yes|helpsurfer||exe| #simple html viewer, needs libgtkhtml.
 yes|hiawatha||exe
 yes|hicolor-icon-theme|hicolor-icon-theme|exe,dev>null,doc,nls
 no|homebank|homebank,homebank-data|exe,dev>null,doc,nls
 yes|homebank||exe,dev,doc,nls| #my own pet with less dependencies.
 yes|hotplug2stdout||exe
@@ -337,10 +338,11 @@
 yes|libgnomeui|libgnomeui-0,libgnomeui-dev|exe,dev,doc,nls
 yes|libgpg-error|libgpg-error0,libgpg-error-dev|exe,dev,doc,nls
 yes|libgphoto2|libgphoto2-2,libgphoto2-2-dev,libgphoto2-port0|exe,dev,doc,nls
 yes|libgringotts|libgringotts2,libgringotts-dev|exe,dev,doc,nls
 yes|libgsf|libgsf-1-114,libgsf-1-dev,libgsf-gnome-1-114|exe,dev,doc,nls
+yes|libgtkhtml||exe,dev,doc,nls| #needed by my osmo pet.
 yes|libical|libical0,libical-dev|exe,dev,doc,nls
 yes|libid3tag|libid3tag0,libid3tag0-dev|exe,dev,doc,nls
 yes|libidl|libidl0,libidl-dev|exe,dev,doc,nls
 yes|libidn|libidn11,libidn11-dev|exe,dev,doc,nls
 yes|libieee1284|libieee1284-3,libieee1284-3-dev|exe,dev,doc,nls
@@ -476,12 +478,12 @@
 yes|openssh_client|openssh-client|exe,dev,doc,nls
 yes|openssl0|libssl0.9.8|exe,dev>null,doc,nls| #old version.
 yes|openssl|openssl,libssl1.0.0,libssl-dev|exe,dev,doc,nls
 yes|orbit2|liborbit2,liborbit2-dev|exe,dev,doc,nls
 yes|orc|liborc-0.4-0,liborc-0.4-dev|exe,dev,doc,nls| #needed by mplayer.
-yes|osmo|osmo|exe,dev,doc,nls
-no|osmo||exe
+no|osmo|osmo|exe,dev,doc,nls| #aaargh, has changed from libgtkhtml dep to webkitgtk, huge size.
+yes|osmo||exe,dev,doc,nls
 yes|ots|libots0,libots-dev|exe,dev,doc,nls
 yes|p11-kit|libp11-kit0|exe,dev>null,doc,nls| #needed by cupsd.
 yes|pam|libpam0g|exe,dev,doc,nls
 yes|pango|libpango1.0-0,libpango1.0-dev|exe,dev,doc,nls
 yes|pangomm|libpangomm-1.4-1,libpangomm-1.4-dev|exe,dev,doc,nls